March 2007 - Wine-Commits - list.winehq.org

Jason Edmeades : cmd.exe: Add support for DIRCMD and sequential qualifier processing.
by Alexandre Julliard March 19, 2007

March 19, 2007

Module: wine Branch: master Commit: 7fba2c0a64e6523d6daecdad07523cccea6fe0a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fba2c0a64e6523d6daecdad0… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 18 21:55:51 2007 +0000 cmd.exe: Add support for DIRCMD and sequential qualifier processing. --- programs/cmd/directory.c | 153 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 106 insertions(+), 47 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index c34072d..67a3276 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -63,7 +63,7 @@ static ULONGLONG byte_total; static DISPLAYTIME dirTime; static DISPLAYORDER dirOrder; static BOOL orderReverse, orderGroupDirs, orderGroupDirsReverse, orderByCol; -static BOOL noseperator; +static BOOL seperator; /***************************************************************************** * WCMD_directory @@ -79,63 +79,122 @@ void WCMD_directory (void) { ULARGE_INTEGER avail, total, free; CONSOLE_SCREEN_BUFFER_INFO consoleInfo; char *p; + char string[MAXSTRING]; + + /* Prefill Quals with (uppercased) DIRCMD env var */ + if (GetEnvironmentVariable ("DIRCMD", string, sizeof(string))) { + p = string; + while ( (*p = toupper(*p)) ) ++p; + strcat(string,quals); + strcpy(quals, string); + } byte_total = 0; file_total = dir_total = 0; + + /* Initialize all flags to their defaults as if no DIRCMD or quals */ + paged_mode = FALSE; + recurse = FALSE; + wide = FALSE; + bare = FALSE; + lower = FALSE; + shortname = FALSE; + usernames = FALSE; + orderByCol = FALSE; + seperator = TRUE; dirTime = Written; dirOrder = Name; orderReverse = FALSE; orderGroupDirs = FALSE; orderGroupDirsReverse = FALSE; - /* Handle args */ - paged_mode = (strstr(quals, "/P") != NULL); - recurse = (strstr(quals, "/S") != NULL); - wide = (strstr(quals, "/W") != NULL); - bare = (strstr(quals, "/B") != NULL); - lower = (strstr(quals, "/L") != NULL); - shortname = (strstr(quals, "/X") != NULL); - usernames = (strstr(quals, "/Q") != NULL); - orderByCol = (strstr(quals, "/D") != NULL); - noseperator= (strstr(quals, "/-C") != NULL); - - if ((p = strstr(quals, "/T")) != NULL) { - p = p + 2; - if (*p==':') p++; /* Skip optional : */ - - if (*p == 'A') dirTime = Access; - else if (*p == 'C') dirTime = Creation; - else if (*p == 'W') dirTime = Written; - - /* Support /T and /T: with no parms, default to written */ - else if (*p == '/') dirTime = Written; - else { - SetLastError(ERROR_INVALID_PARAMETER); - WCMD_print_error(); - return; - } - } + /* Handle args - Loop through so right most is the effective one */ + /* Note: /- appears to be a negate rather than an off, eg. dir + /-W is wide, or dir /w /-w /-w is also wide */ + p = quals; + while (*p && (*p=='/' || *p==' ')) { + BOOL negate = FALSE; + if (*p++==' ') continue; /* Skip / and blanks introduced through DIRCMD */ - if ((p = strstr(quals, "/O")) != NULL) { - p = p + 2; - if (*p==':') p++; /* Skip optional : */ - while (*p && *p != '/') { - switch (*p) { - case 'N': dirOrder = Name; break; - case 'E': dirOrder = Extension; break; - case 'S': dirOrder = Size; break; - case 'D': dirOrder = Date; break; - case '-': if (*(p+1)=='G') orderGroupDirsReverse=TRUE; - else orderReverse = TRUE; - break; - case 'G': orderGroupDirs = TRUE; break; - default: - SetLastError(ERROR_INVALID_PARAMETER); - WCMD_print_error(); - return; - } + if (*p=='-') { + negate = TRUE; p++; } + + WINE_TRACE("Processing arg '%c' (in %s)\n", *p, quals); + switch (*p) { + case 'P': if (negate) paged_mode = !paged_mode; + else paged_mode = TRUE; + break; + case 'S': if (negate) recurse = !recurse; + else recurse = TRUE; + break; + case 'W': if (negate) wide = !wide; + else wide = TRUE; + break; + case 'B': if (negate) bare = !bare; + else bare = TRUE; + break; + case 'L': if (negate) lower = !lower; + else lower = TRUE; + break; + case 'X': if (negate) shortname = !shortname; + else shortname = TRUE; + break; + case 'Q': if (negate) usernames = !usernames; + else usernames = TRUE; + break; + case 'D': if (negate) orderByCol = !orderByCol; + else orderByCol = TRUE; + break; + case 'C': if (negate) seperator = !seperator; + else seperator = TRUE; + break; + case 'T': p = p + 1; + if (*p==':') p++; /* Skip optional : */ + + if (*p == 'A') dirTime = Access; + else if (*p == 'C') dirTime = Creation; + else if (*p == 'W') dirTime = Written; + + /* Support /T and /T: with no parms, default to written */ + else if (*p == 0x00 || *p == '/') { + dirTime = Written; + p = p - 1; /* So when step on, move to '/' */ + } else { + SetLastError(ERROR_INVALID_PARAMETER); + WCMD_print_error(); + return; + } + break; + case 'O': p = p + 1; + if (*p==':') p++; /* Skip optional : */ + while (*p && *p != '/') { + WINE_TRACE("Processing subparm '%c' (in %s)\n", *p, quals); + switch (*p) { + case 'N': dirOrder = Name; break; + case 'E': dirOrder = Extension; break; + case 'S': dirOrder = Size; break; + case 'D': dirOrder = Date; break; + case '-': if (*(p+1)=='G') orderGroupDirsReverse=TRUE; + else orderReverse = TRUE; + break; + case 'G': orderGroupDirs = TRUE; break; + default: + SetLastError(ERROR_INVALID_PARAMETER); + WCMD_print_error(); + return; + } + p++; + } + p = p - 1; /* So when step on, move to '/' */ + break; + default: + SetLastError(ERROR_INVALID_PARAMETER); + WCMD_print_error(); + return; + } + p = p + 1; } /* Handle conflicting args and initialization */ @@ -443,7 +502,7 @@ char * WCMD_filesize64 (ULONGLONG n) { p = buff; i = -3; do { - if (!noseperator && (++i)%3 == 1) *p++ = ','; + if (seperator && ((++i)%3 == 1)) *p++ = ','; q = n / 10; r = n - (q * 10); *p++ = r + '0';

1 0

Jason Edmeades : cmd.exe: Add support for dir /-C.
by Alexandre Julliard March 19, 2007

March 19, 2007

Module: wine Branch: master Commit: f8e619412bc26f79230036f007b96edfc8e3df2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8e619412bc26f79230036f00… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 18 21:55:50 2007 +0000 cmd.exe: Add support for dir /-C. --- programs/cmd/directory.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 49984a6..c34072d 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -63,6 +63,7 @@ static ULONGLONG byte_total; static DISPLAYTIME dirTime; static DISPLAYORDER dirOrder; static BOOL orderReverse, orderGroupDirs, orderGroupDirsReverse, orderByCol; +static BOOL noseperator; /***************************************************************************** * WCMD_directory @@ -96,6 +97,7 @@ void WCMD_directory (void) { shortname = (strstr(quals, "/X") != NULL); usernames = (strstr(quals, "/Q") != NULL); orderByCol = (strstr(quals, "/D") != NULL); + noseperator= (strstr(quals, "/-C") != NULL); if ((p = strstr(quals, "/T")) != NULL) { p = p + 2; @@ -441,7 +443,7 @@ char * WCMD_filesize64 (ULONGLONG n) { p = buff; i = -3; do { - if ((++i)%3 == 1) *p++ = ','; + if (!noseperator && (++i)%3 == 1) *p++ = ','; q = n / 10; r = n - (q * 10); *p++ = r + '0';

1 0

Hans Leidekker : userenv: Add stub implementations for {Register, Unregister}GPNotification.
by Alexandre Julliard March 19, 2007

March 19, 2007

Module: wine Branch: master Commit: 68b255e5e2627a41b4f56dc2d88ad6fdcb74a6b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68b255e5e2627a41b4f56dc2d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Mar 19 12:01:11 2007 +0100 userenv: Add stub implementations for {Register, Unregister}GPNotification. --- dlls/userenv/userenv.spec | 2 ++ dlls/userenv/userenv_main.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/userenv/userenv.spec b/dlls/userenv/userenv.spec index 8fbe776..57726ba 100644 --- a/dlls/userenv/userenv.spec +++ b/dlls/userenv/userenv.spec @@ -9,4 +9,6 @@ @ stdcall GetUserProfileDirectoryW(ptr ptr ptr) @ stdcall LoadUserProfileA(ptr ptr) @ stub LoadUserProfileW +@ stdcall RegisterGPNotification(long long) @ stub UnloadUserProfile +@ stdcall UnregisterGPNotification(long) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 0c65a4d..4965fc3 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -121,3 +121,15 @@ BOOL WINAPI LoadUserProfileA( HANDLE hToken, LPPROFILEINFOA lpProfileInfo ) lpProfileInfo->hProfile = HKEY_CURRENT_USER; return TRUE; } + +BOOL WINAPI RegisterGPNotification( HANDLE event, BOOL machine ) +{ + FIXME("%p %d\n", event, machine ); + return TRUE; +} + +BOOL WINAPI UnregisterGPNotification( HANDLE event ) +{ + FIXME("%p\n", event ); + return TRUE; +}

1 0

Jason Edmeades : cmd.exe: Add support for DIR /D.
by Alexandre Julliard March 19, 2007

March 19, 2007

Module: wine Branch: master Commit: 480c9326955d09a79d4c6e2938ae1359e2b6ad7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=480c9326955d09a79d4c6e293… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Sun Mar 18 21:55:49 2007 +0000 cmd.exe: Add support for DIR /D. --- programs/cmd/directory.c | 51 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 39 insertions(+), 12 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 1c4d056..49984a6 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -28,6 +28,9 @@ #define WIN32_LEAN_AND_MEAN #include "wcmd.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(cmd); int WCMD_dir_sort (const void *a, const void *b); void WCMD_list_directory (char *path, int level); @@ -59,7 +62,7 @@ static int shortname, usernames; static ULONGLONG byte_total; static DISPLAYTIME dirTime; static DISPLAYORDER dirOrder; -static BOOL orderReverse, orderGroupDirs, orderGroupDirsReverse; +static BOOL orderReverse, orderGroupDirs, orderGroupDirsReverse, orderByCol; /***************************************************************************** * WCMD_directory @@ -92,6 +95,7 @@ void WCMD_directory (void) { lower = (strstr(quals, "/L") != NULL); shortname = (strstr(quals, "/X") != NULL); usernames = (strstr(quals, "/Q") != NULL); + orderByCol = (strstr(quals, "/D") != NULL); if ((p = strstr(quals, "/T")) != NULL) { p = p + 2; @@ -136,6 +140,7 @@ void WCMD_directory (void) { if (bare || shortname) wide = FALSE; if (bare) shortname = FALSE; if (wide) usernames = FALSE; + if (orderByCol) wide = TRUE; if (wide) { if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &consoleInfo)) @@ -203,6 +208,8 @@ void WCMD_list_directory (char *search_path, int level) { SYSTEMTIME st; HANDLE hff; int status, dir_count, file_count, entry_count, i, widest, cur_width, tmp_width; + int numCols, numRows; + int rows, cols; ULARGE_INTEGER byte_count, file_size; dir_count = 0; @@ -248,7 +255,7 @@ void WCMD_list_directory (char *search_path, int level) { entry_count++; /* Keep running track of longest filename for wide output */ - if (wide) { + if (wide || orderByCol) { int tmpLen = strlen((fd+(entry_count-1))->cFileName) + 3; if ((fd+(entry_count-1))->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) tmpLen = tmpLen + 2; if (tmpLen > widest) widest = tmpLen; @@ -272,9 +279,31 @@ void WCMD_list_directory (char *search_path, int level) { WCMD_output ("Directory of %s\n\n", real_path); } - for (i=0; i<entry_count; i++) { + /* Work out the number of columns */ + WINE_TRACE("%d entries, maxwidth=%d, widest=%d\n", entry_count, max_width, widest); + if (wide || orderByCol) { + numCols = max(1, (int)max_width / widest); + numRows = entry_count / numCols; + if (entry_count % numCols) numRows++; + } else { + numCols = 1; + numRows = entry_count; + } + WINE_TRACE("cols=%d, rows=%d\n", numCols, numRows); + + for (rows=0; rows<numRows; rows++) { + for (cols=0; cols<numCols; cols++) { char username[24]; + /* Work out the index of the entry being pointed to */ + if (orderByCol) { + i = (cols * numRows) + rows; + if (i >= entry_count) continue; + } else { + i = (rows * numCols) + cols; + if (i >= entry_count) continue; + } + /* /L convers all names to lower case */ if (lower) { char *p = (fd+i)->cFileName; @@ -320,7 +349,6 @@ void WCMD_list_directory (char *search_path, int level) { cur_width = cur_width + widest; if ((cur_width + widest) > max_width) { - WCMD_output ("\n"); cur_width = 0; } else { WCMD_output ("%*.s", (tmp_width - cur_width) ,""); @@ -333,11 +361,11 @@ void WCMD_list_directory (char *search_path, int level) { WCMD_output ("%10s %8s <DIR> ", datestring, timestring); if (shortname) WCMD_output ("%-13s", (fd+i)->cAlternateFileName); if (usernames) WCMD_output ("%-23s", username); - WCMD_output("%s\n",(fd+i)->cFileName); + WCMD_output("%s",(fd+i)->cFileName); } else { if (!((strcmp((fd+i)->cFileName, ".") == 0) || (strcmp((fd+i)->cFileName, "..") == 0))) { - WCMD_output ("%s%s\n", recurse?real_path:"", (fd+i)->cFileName); + WCMD_output ("%s%s", recurse?real_path:"", (fd+i)->cFileName); } } } @@ -351,15 +379,14 @@ void WCMD_list_directory (char *search_path, int level) { WCMD_filesize64(file_size.QuadPart)); if (shortname) WCMD_output ("%-13s", (fd+i)->cAlternateFileName); if (usernames) WCMD_output ("%-23s", username); - WCMD_output("%s\n",(fd+i)->cFileName); + WCMD_output("%s",(fd+i)->cFileName); } else { - WCMD_output ("%s%s\n", recurse?real_path:"", (fd+i)->cFileName); + WCMD_output ("%s%s", recurse?real_path:"", (fd+i)->cFileName); } } - } - - if (wide && cur_width>0) { - WCMD_output ("\n"); + } + WCMD_output ("\n"); + cur_width = 0; } if (!bare) {

1 0

Hans Leidekker : wine.inf: Add cabinet.dll to the list of fake dlls.
by Alexandre Julliard March 19, 2007

March 19, 2007

Module: wine Branch: master Commit: fe329a6a9c6b573067696121fcceb53bda50e384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe329a6a9c6b573067696121f… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Mar 19 12:01:33 2007 +0100 wine.inf: Add cabinet.dll to the list of fake dlls. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 713b0a5..d6f312b 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2159,6 +2159,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,command,start.exe 11,,advapi32.dll 11,,advpack.dll +11,,cabinet.dll 11,,cmd.exe 11,,comctl32.dll 11,,comdlg32.dll

1 0

Kai Blin : netapi32/tests: Use skip when skipping tests.
by Alexandre Julliard March 19, 2007

March 19, 2007

Module: wine Branch: master Commit: 4f4123303f0eecf5fbc3eb45d57865e9d690b36b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f4123303f0eecf5fbc3eb45d… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Mar 19 09:39:11 2007 +0100 netapi32/tests: Use skip when skipping tests. --- dlls/netapi32/tests/access.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index b625c37..92d5d3b 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -56,7 +56,10 @@ static int init_access_tests(void) dwSize = sizeof(user_name); rc=GetUserNameW(user_name, &dwSize); if (rc==FALSE && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) + { + skip("netapi32 functions seem to be missing.\n"); return 0; + } ok(rc, "User Name Retrieved\n"); computer_name[0] = 0; @@ -74,13 +77,16 @@ static void run_usergetinfo_tests(void) /* If this one is not defined then none of the others will be defined */ if (!pNetUserGetInfo) + { + skip("netapi32 functions seem to be missing.\n"); return; + } /* Level 0 */ rc=pNetUserGetInfo(NULL, sAdminUserName, 0, (LPBYTE *)&ui0); if (rc != NERR_Success) { - trace ("Aborting usergetinfo_tests(). NetUserGetInfo: rc=%d\n", rc); - return; + skip("Aborting usergetinfo_tests(). NetUserGetInfo: rc=%d\n", rc); + return; } ok(!lstrcmpW(sAdminUserName, ui0->usri0_name), "This is really user name\n"); pNetApiBufferSize(ui0, &dwSize); @@ -133,7 +139,10 @@ static void run_querydisplayinformation1_tests(void) BOOL hasGuest = FALSE; if (!pNetQueryDisplayInformation) + { + skip("netapi32 functions seem to be missing.\n"); return; + } do {

1 0

Hans Leidekker : setupapi: Add a stub implementation for InstallCatalog.
by Alexandre Julliard March 19, 2007

March 19, 2007

Module: wine Branch: master Commit: a9e4ced18b237f97d2be7473afca9076ff1ea9c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e4ced18b237f97d2be7473a… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Mar 19 12:01:19 2007 +0100 setupapi: Add a stub implementation for InstallCatalog. --- dlls/setupapi/misc.c | 9 +++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 0e9dbd1..4689647 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -966,3 +966,12 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, return ret; } + +/*********************************************************************** + * InstallCatalog (SETUPAPI.@) + */ +DWORD InstallCatalog( LPCSTR catalog, LPCSTR basename, LPSTR fullname ) +{ + FIXME("%s, %s, %p\n", debugstr_a(catalog), debugstr_a(basename), fullname); + return 0; +} diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 92261d5..c44d1d0 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -208,7 +208,7 @@ @ stub GetSetFileTimestamp @ stub GetVersionInfoFromImage @ stub InfIsFromOemLocation -@ stub InstallCatalog +@ stdcall InstallCatalog(str str ptr) @ stdcall InstallHinfSection(long long str long) InstallHinfSectionA @ stdcall InstallHinfSectionA(long long str long) @ stdcall InstallHinfSectionW(long long wstr long)

1 0

Kai Blin : netapi32: Downgrade more ERRs to TRACEs.
by Alexandre Julliard March 19, 2007

March 19, 2007

Module: wine Branch: master Commit: 5091bd9a96c8d1127747453d1d440fae1b75244b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5091bd9a96c8d1127747453d1… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Mar 19 02:34:18 2007 +0100 netapi32: Downgrade more ERRs to TRACEs. --- dlls/netapi32/ds.c | 2 +- dlls/netapi32/wksta.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/ds.c b/dlls/netapi32/ds.c index 33aa1e0..819dc23 100644 --- a/dlls/netapi32/ds.c +++ b/dlls/netapi32/ds.c @@ -116,7 +116,7 @@ DWORD WINAPI DsRoleGetPrimaryDomainInformation( POLICY_VIEW_LOCAL_INFORMATION, &PolicyHandle); if (NtStatus != STATUS_SUCCESS) { - ERR("LsaOpenPolicyFailed with NT status %x\n", + TRACE("LsaOpenPolicyFailed with NT status %x\n", LsaNtStatusToWinError(NtStatus)); return ERROR_OUTOFMEMORY; } diff --git a/dlls/netapi32/wksta.c b/dlls/netapi32/wksta.c index ad4b704..380dcab 100644 --- a/dlls/netapi32/wksta.c +++ b/dlls/netapi32/wksta.c @@ -295,7 +295,7 @@ NetWkstaTransportEnum(LPWSTR ServerName, DWORD level, PBYTE* pbuf, break; } default: - ERR("Invalid level %d is specified\n", level); + TRACE("Invalid level %d is specified\n", level); ret = ERROR_INVALID_LEVEL; } } @@ -366,7 +366,7 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR reserved, DWORD level, &PolicyHandle); if (NtStatus != STATUS_SUCCESS) { - ERR("LsaOpenPolicyFailed with NT status %x\n", + TRACE("LsaOpenPolicyFailed with NT status %x\n", LsaNtStatusToWinError(NtStatus)); NetApiBufferFree(ui0); return ERROR_NOT_ENOUGH_MEMORY; @@ -426,7 +426,7 @@ NET_API_STATUS WINAPI NetWkstaUserGetInfo(LPWSTR reserved, DWORD level, break; } default: - ERR("Invalid level %d is specified\n", level); + TRACE("Invalid level %d is specified\n", level); return ERROR_INVALID_LEVEL; } return NERR_Success;

1 0

Kai Blin : netapi32: Downgrade another WARN and ERR to a TRACE.
by Alexandre Julliard March 19, 2007

March 19, 2007

Module: wine Branch: master Commit: 284683a24e2f2d561b852e30a3ce8325bd84b551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=284683a24e2f2d561b852e30a… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sun Mar 18 22:14:06 2007 +0100 netapi32: Downgrade another WARN and ERR to a TRACE. --- dlls/netapi32/access.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index f63a35c..804b629 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -553,7 +553,7 @@ NetQueryDisplayInformation( } default: - ERR("Invalid level %d is specified\n", Level); + TRACE("Invalid level %d is specified\n", Level); return ERROR_INVALID_LEVEL; } return NERR_Success; @@ -690,7 +690,7 @@ NET_API_STATUS WINAPI NetUserModalsGet( *pbuffer = NULL; return NERR_InternalError; default: - WARN("Invalid level %d is specified\n", level); + TRACE("Invalid level %d is specified\n", level); *pbuffer = NULL; return ERROR_INVALID_LEVEL; }

1 0

Kai Blin : netapi32: Remove another macro, replace by more readable functions.
by Alexandre Julliard March 19, 2007

March 19, 2007

Module: wine Branch: master Commit: fa841ae37982e11f6715232bed04ec270f1afec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa841ae37982e11f6715232be… Author: Kai Blin <kai.blin(a)gmail.com> Date: Mon Mar 19 02:33:36 2007 +0100 netapi32: Remove another macro, replace by more readable functions. --- dlls/netapi32/access.c | 20 +++++++++++++++++--- dlls/netapi32/local_group.c | 1 - dlls/netapi32/netapi32_misc.h | 35 ----------------------------------- 3 files changed, 17 insertions(+), 39 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 804b629..ce324c7 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -31,7 +31,6 @@ #include "lmerr.h" #include "winreg.h" #include "ntsecapi.h" -#include "netapi32_misc.h" #include "wine/debug.h" #include "wine/unicode.h" @@ -41,6 +40,8 @@ static const WCHAR sAdminUserName[] = {'A','d','m','i','n','i','s','t','r','a',' 'o','r',0}; static const WCHAR sGuestUserName[] = {'G','u','e','s','t',0}; +BOOL NETAPI_IsLocalComputer(LPCWSTR ServerName); + /************************************************************ * NETAPI_ValidateServername * @@ -143,7 +144,13 @@ NetUserGetInfo(LPCWSTR servername, LPCWSTR username, DWORD level, status = NETAPI_ValidateServername(servername); if (status != NERR_Success) return status; - NETAPI_ForceLocalComputer(servername, NERR_InvalidComputer); + + if(!NETAPI_IsLocalComputer(servername)) + { + FIXME("Only implemented for local computer, but remote server" + "%s was requested.\n", debugstr_w(servername)); + return NERR_InvalidComputer; + } if(!NETAPI_IsKnownUser(username)) { @@ -466,7 +473,14 @@ NetQueryDisplayInformation( TRACE("(%s, %d, %d, %d, %d, %p, %p)\n", debugstr_w(ServerName), Level, Index, EntriesRequested, PreferredMaximumLength, ReturnedEntryCount, SortedBuffer); - NETAPI_ForceLocalComputer(ServerName, ERROR_ACCESS_DENIED); + + if(!NETAPI_IsLocalComputer(ServerName)) + { + FIXME("Only implemented on local computer, but requested for " + "remote server %s\n", debugstr_w(ServerName)); + return ERROR_ACCESS_DENIED; + } + switch (Level) { case 1: diff --git a/dlls/netapi32/local_group.c b/dlls/netapi32/local_group.c index 68534ac..a9f838f 100644 --- a/dlls/netapi32/local_group.c +++ b/dlls/netapi32/local_group.c @@ -31,7 +31,6 @@ #include "lmerr.h" #include "winreg.h" #include "ntsecapi.h" -#include "netapi32_misc.h" #include "wine/debug.h" #include "wine/unicode.h" diff --git a/dlls/netapi32/netapi32_misc.h b/dlls/netapi32/netapi32_misc.h deleted file mode 100644 index 947d900..0000000 --- a/dlls/netapi32/netapi32_misc.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2002 Andriy Palamarchuk - * - * netapi32 internal functions. - * - * 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, writ -e to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_NETAPI32_MISC_H -#define __WINE_NETAPI32_MISC_H - -extern BOOL NETAPI_IsLocalComputer(LPCWSTR ServerName); - -#define NETAPI_ForceLocalComputer(ServerName, FailureCode) \ - if (!NETAPI_IsLocalComputer(ServerName)) \ - { \ - FIXME("Action Implemented for local computer only. " \ - "Requested for server %s\n", debugstr_w(ServerName)); \ - return FailureCode; \ - } - -#endif

1 0