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

Kai Blin : netapi32: Implement NetUserDel.
by Alexandre Julliard March 26, 2007

March 26, 2007

Module: wine Branch: master Commit: 2207f20b5ff6edfa5cac6720f3530ae5da392b55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2207f20b5ff6edfa5cac6720f… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Mar 24 09:01:32 2007 +0100 netapi32: Implement NetUserDel. --- dlls/netapi32/access.c | 51 ++++++++++++++++++++++------------------- dlls/netapi32/tests/access.c | 5 +++- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 6d84b40..8cc3cad 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -91,26 +91,22 @@ static NET_API_STATUS NETAPI_ValidateServername(LPCWSTR ServerName) } /************************************************************ - * NETAPI_IsKnownUser + * NETAPI_FindUser * - * Checks whether the user name indicates current user. + * Looks for a user in the user database. + * Returns a pointer to the entry in the user list when the user + * is found, NULL otherwise. */ -static BOOL NETAPI_IsKnownUser(LPCWSTR UserName) +static struct sam_user* NETAPI_FindUser(LPCWSTR UserName) { - DWORD dwSize = UNLEN + 1; - BOOL Result; - LPWSTR buf; + struct sam_user *user; - if (!lstrcmpW(UserName, sAdminUserName) || - !lstrcmpW(UserName, sGuestUserName)) - return TRUE; - NetApiBufferAllocate(dwSize * sizeof(WCHAR), (LPVOID *) &buf); - Result = GetUserNameW(buf, &dwSize); - - Result = Result && !lstrcmpW(UserName, buf); - NetApiBufferFree(buf); - - return Result; + LIST_FOR_EACH_ENTRY(user, &user_list, struct sam_user, entry) + { + if(lstrcmpW(user->user_name, UserName) == 0) + return user; + } + return NULL; } /************************************************************ @@ -198,17 +194,24 @@ NET_API_STATUS WINAPI NetUserAdd(LPCWSTR servername, NET_API_STATUS WINAPI NetUserDel(LPCWSTR servername, LPCWSTR username) { NET_API_STATUS status; - FIXME("(%s, %s) stub!\n", debugstr_w(servername), debugstr_w(username)); + struct sam_user *user; - status = NETAPI_ValidateServername(servername); - if (status != NERR_Success) + TRACE("(%s, %s)\n", debugstr_w(servername), debugstr_w(username)); + + if((status = NETAPI_ValidateServername(servername))!= NERR_Success) return status; - if (!NETAPI_IsKnownUser(username)) + if ((user = NETAPI_FindUser(username)) == NULL) return NERR_UserNotFound; - /* Delete the user here */ - return status; + list_remove(&user->entry); + + HeapFree(GetProcessHeap(), 0, user->home_dir); + HeapFree(GetProcessHeap(), 0, user->user_comment); + HeapFree(GetProcessHeap(), 0, user->user_logon_script_path); + HeapFree(GetProcessHeap(), 0, user); + + return NERR_Success; } /************************************************************ @@ -232,7 +235,7 @@ NetUserGetInfo(LPCWSTR servername, LPCWSTR username, DWORD level, return NERR_InvalidComputer; } - if(!NETAPI_IsKnownUser(username)) + if(!NETAPI_FindUser(username)) { TRACE("User %s is unknown.\n", debugstr_w(username)); return NERR_UserNotFound; @@ -404,7 +407,7 @@ NetUserGetLocalGroups(LPCWSTR servername, LPCWSTR username, DWORD level, if (status != NERR_Success) return status; - if (!NETAPI_IsKnownUser(username)) + if (!NETAPI_FindUser(username)) return NERR_UserNotFound; if (bufptr) *bufptr = NULL; diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 226e3d6..4922ed6 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -259,7 +259,10 @@ static void run_userhandling_tests(void) todo_wine ok(ret == NERR_Success, "Changing the password failed.\n"); ret = pNetUserDel(NULL, sTestUserName); - todo_wine ok(ret == NERR_Success, "Deleting the user failed.\n"); + ok(ret == NERR_Success, "Deleting the user failed.\n"); + + ret = pNetUserDel(NULL, sTestUserName); + ok(ret == NERR_UserNotFound, "Deleting a nonexistent user returned 0x%08x\n",ret); } START_TEST(access)

1 0

Kai Blin : netapi32/tests: Make NetGetUserInfo checks language independent.
by Alexandre Julliard March 26, 2007

March 26, 2007

Module: wine Branch: master Commit: 936662094f188d449bdc7099b1007a41f5b2da7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=936662094f188d449bdc7099b… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Mar 24 09:02:54 2007 +0100 netapi32/tests: Make NetGetUserInfo checks language independent. --- dlls/netapi32/tests/access.c | 65 +++++++++++++++++++++++++++++------------ 1 files changed, 46 insertions(+), 19 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index e06681e..c92c9f8 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -32,10 +32,6 @@ WCHAR user_name[UNLEN + 1]; WCHAR computer_name[MAX_COMPUTERNAME_LENGTH + 1]; -/* FIXME : Tests should be language independent */ -static const WCHAR sAdminUserName[] = {'A','d','m','i','n','i','s','t','r','a','t', - 'o','r',0}; -static const WCHAR sGuestUserName[] = {'G','u','e','s','t',0}; static const WCHAR sNonexistentUser[] = {'N','o','n','e','x','i','s','t','e','n','t',' ', 'U','s','e','r',0}; static WCHAR sTooLongName[] = {'T','h','i','s',' ','i','s',' ','a',' ','b','a','d', @@ -91,6 +87,26 @@ static int init_access_tests(void) return 1; } +static NET_API_STATUS create_test_user(void) +{ + USER_INFO_1 usri; + + usri.usri1_name = sTestUserName; + usri.usri1_password = sTestUserOldPass; + usri.usri1_priv = USER_PRIV_USER; + usri.usri1_home_dir = NULL; + usri.usri1_comment = NULL; + usri.usri1_flags = UF_SCRIPT; + usri.usri1_script_path = NULL; + + return pNetUserAdd(NULL, 1, (LPBYTE)&usri, NULL); +} + +static NET_API_STATUS delete_test_user(void) +{ + return pNetUserDel(NULL, sTestUserName); +} + static void run_usergetinfo_tests(void) { NET_API_STATUS rc; @@ -98,22 +114,25 @@ static void run_usergetinfo_tests(void) PUSER_INFO_10 ui10 = NULL; DWORD dwSize; - /* Level 0 */ - rc=pNetUserGetInfo(NULL, sAdminUserName, 0, (LPBYTE *)&ui0); - if (rc != NERR_Success) { - skip("Aborting usergetinfo_tests(). NetUserGetInfo: rc=%d\n", rc); + if((rc = create_test_user()) != NERR_Success ) + { + skip("Skipping usergetinfo_tests, create_test_user failed: 0x%08x\n", rc); return; } - ok(!lstrcmpW(sAdminUserName, ui0->usri0_name), "This is really user name\n"); + + /* Level 0 */ + rc=pNetUserGetInfo(NULL, sTestUserName, 0, (LPBYTE *)&ui0); + ok(rc == NERR_Success, "NetUserGetInfo level 0 failed: 0x%08x.\n", rc); + ok(!lstrcmpW(sTestUserName, ui0->usri0_name),"Username mismatch for level 0.\n"); pNetApiBufferSize(ui0, &dwSize); ok(dwSize >= (sizeof(USER_INFO_0) + (lstrlenW(ui0->usri0_name) + 1) * sizeof(WCHAR)), "Is allocated with NetApiBufferAllocate\n"); /* Level 10 */ - rc=pNetUserGetInfo(NULL, sAdminUserName, 10, (LPBYTE *)&ui10); - ok(rc == NERR_Success, "NetUserGetInfo: rc=%d\n", rc); - ok(!lstrcmpW(sAdminUserName, ui10->usri10_name), "This is really user name\n"); + rc=pNetUserGetInfo(NULL, sTestUserName, 10, (LPBYTE *)&ui10); + ok(rc == NERR_Success, "NetUserGetInfo level 10 failed: 0x%08x.\n", rc); + ok(!lstrcmpW(sTestUserName, ui10->usri10_name), "Username mismatch for level 10.\n"); pNetApiBufferSize(ui10, &dwSize); ok(dwSize >= (sizeof(USER_INFO_10) + (lstrlenW(ui10->usri10_name) + 1 + @@ -126,26 +145,31 @@ static void run_usergetinfo_tests(void) pNetApiBufferFree(ui10); /* errors handling */ - rc=pNetUserGetInfo(NULL, sAdminUserName, 10000, (LPBYTE *)&ui0); + rc=pNetUserGetInfo(NULL, sTestUserName, 10000, (LPBYTE *)&ui0); ok(rc == ERROR_INVALID_LEVEL,"Invalid Level: rc=%d\n",rc); rc=pNetUserGetInfo(NULL, sNonexistentUser, 0, (LPBYTE *)&ui0); ok(rc == NERR_UserNotFound,"Invalid User Name: rc=%d\n",rc); todo_wine { /* FIXME - Currently Wine can't verify whether the network path is good or bad */ - rc=pNetUserGetInfo(sBadNetPath, sAdminUserName, 0, (LPBYTE *)&ui0); + rc=pNetUserGetInfo(sBadNetPath, sTestUserName, 0, (LPBYTE *)&ui0); ok(rc == ERROR_BAD_NETPATH || rc == ERROR_NETWORK_UNREACHABLE, "Bad Network Path: rc=%d\n",rc); } - rc=pNetUserGetInfo(sEmptyStr, sAdminUserName, 0, (LPBYTE *)&ui0); + rc=pNetUserGetInfo(sEmptyStr, sTestUserName, 0, (LPBYTE *)&ui0); ok(rc == ERROR_BAD_NETPATH || rc == NERR_Success, "Bad Network Path: rc=%d\n",rc); - rc=pNetUserGetInfo(sInvalidName, sAdminUserName, 0, (LPBYTE *)&ui0); + rc=pNetUserGetInfo(sInvalidName, sTestUserName, 0, (LPBYTE *)&ui0); ok(rc == ERROR_INVALID_NAME,"Invalid Server Name: rc=%d\n",rc); - rc=pNetUserGetInfo(sInvalidName2, sAdminUserName, 0, (LPBYTE *)&ui0); + rc=pNetUserGetInfo(sInvalidName2, sTestUserName, 0, (LPBYTE *)&ui0); ok(rc == ERROR_INVALID_NAME,"Invalid Server Name: rc=%d\n",rc); + + if(delete_test_user() != NERR_Success) + trace("Deleting the test user failed. You might have to manually delete it."); } -/* checks Level 1 of NetQueryDisplayInformation */ +/* checks Level 1 of NetQueryDisplayInformation + * FIXME: Needs to be rewritten to not depend on the spelling of the users, + * ideally based on the admin and guest user SIDs/RIDs.*/ static void run_querydisplayinformation1_tests(void) { PNET_DISPLAY_USER Buffer, rec; @@ -153,6 +177,9 @@ static void run_querydisplayinformation1_tests(void) DWORD i = 0; BOOL hasAdmin = FALSE; BOOL hasGuest = FALSE; + static const WCHAR sAdminUserName[] = {'A','d','m','i','n','i','s','t','r','a', + 't','o','r',0}; + static const WCHAR sGuestUserName[] = {'G','u','e','s','t',0}; do { @@ -308,10 +335,10 @@ START_TEST(access) } if (init_access_tests()) { + run_userhandling_tests(); run_usergetinfo_tests(); run_querydisplayinformation1_tests(); run_usermodalsget_tests(); - run_userhandling_tests(); } FreeLibrary(hnetapi32);

1 0

Kai Blin : netapi32: Implement NetUserAdd with a dummy user database.
by Alexandre Julliard March 26, 2007

March 26, 2007

Module: wine Branch: master Commit: 5934c2c9b1794f70d83ca0e7b1b6eeb485fb11b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5934c2c9b1794f70d83ca0e7b… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Mar 24 09:01:13 2007 +0100 netapi32: Implement NetUserAdd with a dummy user database. --- dlls/netapi32/access.c | 94 ++++++++++++++++++++++++++++++++++++++--- dlls/netapi32/tests/access.c | 8 ++-- 2 files changed, 91 insertions(+), 11 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index ce324c7..6d84b40 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -33,13 +33,37 @@ #include "ntsecapi.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(netapi32); +/* NOTE: So far, this is implemented to support tests that require user logins, + * but not designed to handle real user databases. Those should probably + * be synced with either the host's user database or with Samba. + * + * FIXME: The user database should hold all the information the USER_INFO_4 struct + * needs, but for the first try, I will just implement the USER_INFO_1 fields. + */ + +struct sam_user +{ + struct list entry; + WCHAR user_name[LM20_UNLEN+1]; + WCHAR user_password[PWLEN + 1]; + DWORD sec_since_passwd_change; + DWORD user_priv; + LPWSTR home_dir; + LPWSTR user_comment; + DWORD user_flags; + LPWSTR user_logon_script_path; +}; + static const WCHAR sAdminUserName[] = {'A','d','m','i','n','i','s','t','r','a','t', 'o','r',0}; static const WCHAR sGuestUserName[] = {'G','u','e','s','t',0}; +static struct list user_list = LIST_INIT( user_list ); + BOOL NETAPI_IsLocalComputer(LPCWSTR ServerName); /************************************************************ @@ -96,18 +120,74 @@ NET_API_STATUS WINAPI NetUserAdd(LPCWSTR servername, DWORD level, LPBYTE bufptr, LPDWORD parm_err) { NET_API_STATUS status; + struct sam_user * su = NULL; + FIXME("(%s, %d, %p, %p) stub!\n", debugstr_w(servername), level, bufptr, parm_err); - status = NETAPI_ValidateServername(servername); - if (status != NERR_Success) + if((status = NETAPI_ValidateServername(servername)) != NERR_Success) return status; - - if ((bufptr != NULL) && (level > 0) && (level <= 4)) + + switch(level) + { + /* Level 3 and 4 are identical for the purposes of NetUserAdd */ + case 4: + case 3: + FIXME("Level 3 and 4 not implemented.\n"); + /* Fall through */ + case 2: + FIXME("Level 2 not implemented.\n"); + /* Fall throught */ + case 1: { PUSER_INFO_1 ui = (PUSER_INFO_1) bufptr; - TRACE("usri%d_name: %s\n", level, debugstr_w(ui->usri1_name)); - TRACE("usri%d_password: %s\n", level, debugstr_w(ui->usri1_password)); - TRACE("usri%d_comment: %s\n", level, debugstr_w(ui->usri1_comment)); + su = HeapAlloc(GetProcessHeap(), 0, sizeof(struct sam_user)); + if(!su) + { + status = NERR_InternalError; + break; + } + + if(lstrlenW(ui->usri1_name) > LM20_UNLEN) + { + status = NERR_BadUsername; + break; + } + + /*FIXME: do other checks for a valid username */ + lstrcpyW(su->user_name, ui->usri1_name); + + if(lstrlenW(ui->usri1_password) > PWLEN) + { + /* Always return PasswordTooShort on invalid passwords. */ + status = NERR_PasswordTooShort; + break; + } + lstrcpyW(su->user_password, ui->usri1_password); + + su->sec_since_passwd_change = ui->usri1_password_age; + su->user_priv = ui->usri1_priv; + su->user_flags = ui->usri1_flags; + + /*FIXME: set the other LPWSTRs to NULL for now */ + su->home_dir = NULL; + su->user_comment = NULL; + su->user_logon_script_path = NULL; + + list_add_head(&user_list, &su->entry); + return NERR_Success; + } + default: + TRACE("Invalid level %d specified.\n", level); + status = ERROR_INVALID_LEVEL; + break; + } + + if(su) + { + HeapFree(GetProcessHeap(), 0, su->home_dir); + HeapFree(GetProcessHeap(), 0, su->user_comment); + HeapFree(GetProcessHeap(), 0, su->user_logon_script_path); + HeapFree(GetProcessHeap(), 0, su); } return status; } diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index 93d7e63..226e3d6 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -217,26 +217,26 @@ static void run_userhandling_tests(void) usri.usri1_password = sTestUserOldPass; ret = pNetUserAdd(NULL, 1, (LPBYTE)&usri, NULL); - todo_wine ok(ret == NERR_BadUsername, "Adding user with too long username returned 0x%08x\n", ret); + ok(ret == NERR_BadUsername, "Adding user with too long username returned 0x%08x\n", ret); usri.usri1_name = sTestUserName; usri.usri1_password = sTooLongPassword; ret = pNetUserAdd(NULL, 1, (LPBYTE)&usri, NULL); - todo_wine ok(ret == NERR_PasswordTooShort, "Adding user with too long password returned 0x%08x\n", ret); + ok(ret == NERR_PasswordTooShort, "Adding user with too long password returned 0x%08x\n", ret); usri.usri1_name = sTooLongName; usri.usri1_password = sTooLongPassword; ret = pNetUserAdd(NULL, 1, (LPBYTE)&usri, NULL); - todo_wine ok(ret == NERR_BadUsername, + ok(ret == NERR_BadUsername, "Adding user with too long username/password returned 0x%08x\n", ret); usri.usri1_name = sTestUserName; usri.usri1_password = sTestUserOldPass; ret = pNetUserAdd(NULL, 5, (LPBYTE)&usri, NULL); - todo_wine ok(ret == ERROR_INVALID_LEVEL, "Adding user with level 5 returned 0x%08x\n", ret); + ok(ret == ERROR_INVALID_LEVEL, "Adding user with level 5 returned 0x%08x\n", ret); ret = pNetUserAdd(NULL, 1, (LPBYTE)&usri, NULL); if(ret == ERROR_ACCESS_DENIED)

1 0

Kai Blin : netapi32/test: Test the username and password length limits.
by Alexandre Julliard March 26, 2007

March 26, 2007

Module: wine Branch: master Commit: 9ab988682135f06a0c88e383832559aaa72b1bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ab988682135f06a0c88e3838… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sat Mar 24 09:00:34 2007 +0100 netapi32/test: Test the username and password length limits. --- dlls/netapi32/tests/access.c | 48 +++++++++++++++++++++++++++++++++++++---- 1 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/netapi32/tests/access.c b/dlls/netapi32/tests/access.c index c1bc9d7..93d7e63 100644 --- a/dlls/netapi32/tests/access.c +++ b/dlls/netapi32/tests/access.c @@ -38,9 +38,24 @@ static const WCHAR sAdminUserName[] = {'A','d','m','i','n','i','s','t','r','a',' static const WCHAR sGuestUserName[] = {'G','u','e','s','t',0}; static const WCHAR sNonexistentUser[] = {'N','o','n','e','x','i','s','t','e','n','t',' ', 'U','s','e','r',0}; -static const WCHAR sTestUserName[] = {'t', 'e', 's', 't', 'u', 's', 'e', 'r', 0}; -static const WCHAR sTestUserOldPass[] = {'o', 'l', 'd', 'p', 'a', 's', 's', 0}; -static const WCHAR sTestUserNewPass[] = {'n', 'e', 'w', 'p', 'a', 's', 's', 0}; +static WCHAR sTooLongName[] = {'T','h','i','s',' ','i','s',' ','a',' ','b','a','d', + ' ','u','s','e','r','n','a','m','e',0}; +static WCHAR sTooLongPassword[] = {'a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h', + 'a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h', + 'a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h', + 'a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h', + 'a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h', + 'a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h', + 'a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h', + 'a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h', + 'a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h', + 'a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h', + 'a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h','a','b','c','d','e','f','g','h', + 'a', 0}; + +static WCHAR sTestUserName[] = {'t', 'e', 's', 't', 'u', 's', 'e', 'r', 0}; +static WCHAR sTestUserOldPass[] = {'o', 'l', 'd', 'p', 'a', 's', 's', 0}; +static WCHAR sTestUserNewPass[] = {'n', 'e', 'w', 'p', 'a', 's', 's', 0}; static const WCHAR sBadNetPath[] = {'\\','\\','B','a',' ',' ','p','a','t','h',0}; static const WCHAR sInvalidName[] = {'\\',0}; static const WCHAR sInvalidName2[] = {'\\','\\',0}; @@ -192,14 +207,37 @@ static void run_userhandling_tests(void) NET_API_STATUS ret; USER_INFO_1 usri; - usri.usri1_name = (LPWSTR) sTestUserName; - usri.usri1_password = (LPWSTR) sTestUserOldPass; usri.usri1_priv = USER_PRIV_USER; usri.usri1_home_dir = NULL; usri.usri1_comment = NULL; usri.usri1_flags = UF_SCRIPT; usri.usri1_script_path = NULL; + usri.usri1_name = sTooLongName; + usri.usri1_password = sTestUserOldPass; + + ret = pNetUserAdd(NULL, 1, (LPBYTE)&usri, NULL); + todo_wine ok(ret == NERR_BadUsername, "Adding user with too long username returned 0x%08x\n", ret); + + usri.usri1_name = sTestUserName; + usri.usri1_password = sTooLongPassword; + + ret = pNetUserAdd(NULL, 1, (LPBYTE)&usri, NULL); + todo_wine ok(ret == NERR_PasswordTooShort, "Adding user with too long password returned 0x%08x\n", ret); + + usri.usri1_name = sTooLongName; + usri.usri1_password = sTooLongPassword; + + ret = pNetUserAdd(NULL, 1, (LPBYTE)&usri, NULL); + todo_wine ok(ret == NERR_BadUsername, + "Adding user with too long username/password returned 0x%08x\n", ret); + + usri.usri1_name = sTestUserName; + usri.usri1_password = sTestUserOldPass; + + ret = pNetUserAdd(NULL, 5, (LPBYTE)&usri, NULL); + todo_wine ok(ret == ERROR_INVALID_LEVEL, "Adding user with level 5 returned 0x%08x\n", ret); + ret = pNetUserAdd(NULL, 1, (LPBYTE)&usri, NULL); if(ret == ERROR_ACCESS_DENIED) {

1 0

Dmitry Timoshkov : gdi32: Implement GdiGetCodePage.
by Alexandre Julliard March 26, 2007

March 26, 2007

Module: wine Branch: master Commit: 826e937a81ffe7169759b49f456a2836b2ae56fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=826e937a81ffe7169759b49f4… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Mar 26 17:03:51 2007 +0900 gdi32: Implement GdiGetCodePage. --- dlls/gdi32/font.c | 37 ++++++++++++++++++++++++------------- dlls/gdi32/gdi32.spec | 4 ++-- include/wingdi.h | 1 + 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index e8b96c4..ea2e66c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -347,22 +347,11 @@ static void FONT_NewTextMetricExWToA(const NEWTEXTMETRICEXW *ptmW, NEWTEXTMETRIC /*********************************************************************** - * FONT_mbtowc - * - * Returns a Unicode translation of str using the charset of the - * currently selected font in hdc. If count is -1 then str is assumed - * to be '\0' terminated, otherwise it contains the number of bytes to - * convert. If plenW is non-NULL, on return it will point to the - * number of WCHARs that have been written. If pCP is non-NULL, on - * return it will point to the codepage used in the conversion. The - * caller should free the returned LPWSTR from the process heap - * itself. + * GdiGetCodePage (GDI32.@) */ -static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW, UINT *pCP) +DWORD WINAPI GdiGetCodePage( HDC hdc ) { UINT cp = CP_ACP; - INT lenW; - LPWSTR strW; CHARSETINFO csi; int charset = GetTextCharset(hdc); @@ -402,6 +391,28 @@ static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW, UINT *pCP) } TRACE("charset %d => cp %d\n", charset, cp); + return cp; +} + +/*********************************************************************** + * FONT_mbtowc + * + * Returns a Unicode translation of str using the charset of the + * currently selected font in hdc. If count is -1 then str is assumed + * to be '\0' terminated, otherwise it contains the number of bytes to + * convert. If plenW is non-NULL, on return it will point to the + * number of WCHARs that have been written. If pCP is non-NULL, on + * return it will point to the codepage used in the conversion. The + * caller should free the returned LPWSTR from the process heap + * itself. + */ +static LPWSTR FONT_mbtowc(HDC hdc, LPCSTR str, INT count, INT *plenW, UINT *pCP) +{ + UINT cp; + INT lenW; + LPWSTR strW; + + cp = GdiGetCodePage( hdc ); if(count == -1) count = strlen(str); lenW = MultiByteToWideChar(cp, 0, str, count, NULL, 0); diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 10ec996..6f1c71b 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -178,8 +178,8 @@ @ stdcall GdiFlush() # @ stub GdiFullscreenControl @ stdcall GdiGetBatchLimit() -@ stdcall GdiGetCharDimensions(ptr ptr ptr) -# @ stub GdiGetCodePage +@ stdcall GdiGetCharDimensions(long ptr ptr) +@ stdcall GdiGetCodePage(long) # @ stub GdiGetDC # @ stub GdiGetDevmodeForPage @ stub GdiGetLocalBitmap diff --git a/include/wingdi.h b/include/wingdi.h index a357c77..ca72f33 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -3396,6 +3396,7 @@ BOOL WINAPI GdiComment(HDC,UINT,const BYTE *); DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *); BOOL WINAPI GdiFlush(void); LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *); +DWORD WINAPI GdiGetCodePage(HDC); BOOL WINAPI GdiGradientFill(HDC,PTRIVERTEX,ULONG,PVOID,ULONG,ULONG); BOOL WINAPI GdiIsMetaFileDC(HDC); BOOL WINAPI GdiIsMetaPrintDC(HDC);

1 0

Piotr Caban : comctl32: Fixed TreeView_EndEditLabelNow crash.
by Alexandre Julliard March 26, 2007

March 26, 2007

Module: wine Branch: master Commit: 47aaf09dc391a56df8d3f09a6e3984ddd70271ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=47aaf09dc391a56df8d3f09a6… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Sat Mar 24 10:53:49 2007 +0100 comctl32: Fixed TreeView_EndEditLabelNow crash. --- dlls/comctl32/treeview.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 8ababc9..85e6f68 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3793,7 +3793,8 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) if (strcmpW(newText, editedItem->pszText) != 0) { - if (NULL == ReAlloc(editedItem->pszText, iLength + 1)) + WCHAR *ptr = ReAlloc(editedItem->pszText, sizeof(WCHAR)*(iLength + 1)); + if (ptr == NULL) { ERR("OutOfMemory, cannot allocate space for label\n"); DestroyWindow(infoPtr->hwndEdit); @@ -3802,6 +3803,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel) } else { + editedItem->pszText = ptr; editedItem->cchTextMax = iLength + 1; strcpyW(editedItem->pszText, newText); }

1 0

Chris Robinson : quartz: Propogate transform filter errors upstream.
by Alexandre Julliard March 26, 2007

March 26, 2007

Module: wine Branch: master Commit: 908cc50e23e9d9084758fe42d30cf5c0694f6ea3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=908cc50e23e9d9084758fe42d… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Mon Mar 26 00:30:31 2007 -0700 quartz: Propogate transform filter errors upstream. --- dlls/quartz/transform.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/transform.c b/dlls/quartz/transform.c index 8343afb..0662523 100644 --- a/dlls/quartz/transform.c +++ b/dlls/quartz/transform.c @@ -92,9 +92,7 @@ static HRESULT TransformFilter_Sample(LPVOID iface, IMediaSample * pSample) } #endif - This->pFuncsTable->pfnProcessSampleData(This, pbSrcStream, cbSrcStream); - - return S_OK; + return This->pFuncsTable->pfnProcessSampleData(This, pbSrcStream, cbSrcStream); } static HRESULT TransformFilter_Input_QueryAccept(LPVOID iface, const AM_MEDIA_TYPE * pmt)

1 0

Chris Robinson : quartz: Store the current reference time with the PullPin.
by Alexandre Julliard March 26, 2007

March 26, 2007

Module: wine Branch: master Commit: f5400a28519a0d64e6f97464ec4596d1c8555b86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5400a28519a0d64e6f97464e… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun Mar 25 15:18:49 2007 -0700 quartz: Store the current reference time with the PullPin. --- dlls/quartz/pin.c | 13 +++++++------ dlls/quartz/pin.h | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index b3aa042..58e5bee 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -1044,6 +1044,7 @@ HRESULT PullPin_Init(const PIN_INFO * pPinInfo, SAMPLEPROC pSampleProc, LPVOID p pPinImpl->hEventStateChanged = CreateEventW(NULL, FALSE, TRUE, NULL); pPinImpl->rtStart = 0; + pPinImpl->rtCurrent = 0; pPinImpl->rtStop = ((LONGLONG)0x7fffffff << 32) | 0xffffffff; return S_OK; @@ -1177,7 +1178,6 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) PullPin *This = (PullPin *)iface; HRESULT hr; - REFERENCE_TIME rtCurrent; ALLOCATOR_PROPERTIES allocProps; PIN_INFO pinInfo; @@ -1187,11 +1187,12 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) hr = IMemAllocator_GetProperties(This->pAlloc, &allocProps); - rtCurrent = MEDIATIME_FROM_BYTES(ALIGNDOWN(BYTES_FROM_MEDIATIME(This->rtStart), allocProps.cbAlign)); + if (This->rtCurrent < This->rtStart) + This->rtCurrent = MEDIATIME_FROM_BYTES(ALIGNDOWN(BYTES_FROM_MEDIATIME(This->rtStart), allocProps.cbAlign)); TRACE("Start\n"); - while (rtCurrent < This->rtStop && hr == S_OK) + while (This->rtCurrent < This->rtStop && hr == S_OK) { /* FIXME: to improve performance by quite a bit this should be changed * so that one sample is processed while one sample is fetched. However, @@ -1208,11 +1209,11 @@ static void CALLBACK PullPin_Thread_Process(ULONG_PTR iface) if (SUCCEEDED(hr)) { - rtSampleStop = rtCurrent + MEDIATIME_FROM_BYTES(IMediaSample_GetSize(pSample)); + rtSampleStop = This->rtCurrent + MEDIATIME_FROM_BYTES(IMediaSample_GetSize(pSample)); if (rtSampleStop > This->rtStop) rtSampleStop = MEDIATIME_FROM_BYTES(ALIGNUP(BYTES_FROM_MEDIATIME(This->rtStop), allocProps.cbAlign)); - hr = IMediaSample_SetTime(pSample, &rtCurrent, &rtSampleStop); - rtCurrent = rtSampleStop; + hr = IMediaSample_SetTime(pSample, &This->rtCurrent, &rtSampleStop); + This->rtCurrent = rtSampleStop; } if (SUCCEEDED(hr)) diff --git a/dlls/quartz/pin.h b/dlls/quartz/pin.h index bb48df3..02830cc 100644 --- a/dlls/quartz/pin.h +++ b/dlls/quartz/pin.h @@ -84,6 +84,7 @@ typedef struct PullPin HANDLE hEventStateChanged; REFERENCE_TIME rtStart; REFERENCE_TIME rtStop; + REFERENCE_TIME rtCurrent; } PullPin; /*** Initializers ***/

1 0

Chris Robinson : quartz: Implement volume and pan control for DSoundRenderer.
by Alexandre Julliard March 26, 2007

March 26, 2007

Module: wine Branch: master Commit: 57400724b6cac540f0fada09ae87490d4e37aec7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57400724b6cac540f0fada09a… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sun Mar 25 20:13:53 2007 -0700 quartz: Implement volume and pan control for DSoundRenderer. --- dlls/quartz/dsoundrender.c | 47 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index a060ddc..80f7257 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -66,6 +66,9 @@ typedef struct DSoundRenderImpl LPDIRECTSOUNDBUFFER dsbuffer; DWORD write_pos; BOOL init; + + long volume; + long pan; } DSoundRenderImpl; static HRESULT DSoundRender_InputPin_Construct(const PIN_INFO * pPinInfo, SAMPLEPROC pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) @@ -141,6 +144,7 @@ static HRESULT DSoundRender_CreateSoundBuffer(IBaseFilter * iface) memset(&buf_desc,0,sizeof(DSBUFFERDESC)); buf_desc.dwSize = sizeof(DSBUFFERDESC); + buf_desc.dwFlags = DSBCAPS_CTRLVOLUME | DSBCAPS_CTRLPAN | DSBCAPS_CTRLFREQUENCY; buf_desc.dwBufferBytes = DSBUFFERSIZE; buf_desc.lpwfxFormat = &wav_fmt; hr = IDirectSound_CreateSoundBuffer(This->dsound, &buf_desc, &This->dsbuffer, NULL); @@ -149,6 +153,15 @@ static HRESULT DSoundRender_CreateSoundBuffer(IBaseFilter * iface) IDirectSound_Release(This->dsound); return hr; } + + hr = IDirectSoundBuffer_SetVolume(This->dsbuffer, This->volume); + if (FAILED(hr)) + ERR("Can't set volume to %ld (%x)!\n", This->volume, hr); + + hr = IDirectSoundBuffer_SetPan(This->dsbuffer, This->pan); + if (FAILED(hr)) + ERR("Can't set pan to %ld (%x)!\n", This->pan, hr); + hr = IDirectSoundBuffer_Play(This->dsbuffer, 0, 0, DSBPLAY_LOOPING); if (FAILED(hr)) { ERR("Can't start sound buffer (%x)!\n", hr); @@ -801,8 +814,17 @@ static HRESULT WINAPI Basicaudio_put_Volume(IBasicAudio *iface, long lVolume) { ICOM_THIS_MULTI(DSoundRenderImpl, IBasicAudio_vtbl, iface); - TRACE("(%p/%p)->(%ld): stub !!!\n", This, iface, lVolume); + TRACE("(%p/%p)->(%ld)\n", This, iface, lVolume); + + if (lVolume > DSBVOLUME_MAX || lVolume < DSBVOLUME_MIN) + return E_INVALIDARG; + + if (This->dsbuffer) { + if (FAILED(IDirectSoundBuffer_SetVolume(This->dsbuffer, lVolume))) + return E_FAIL; + } + This->volume = lVolume; return S_OK; } @@ -810,8 +832,12 @@ static HRESULT WINAPI Basicaudio_get_Volume(IBasicAudio *iface, long *plVolume) { ICOM_THIS_MULTI(DSoundRenderImpl, IBasicAudio_vtbl, iface); - TRACE("(%p/%p)->(%p): stub !!!\n", This, iface, plVolume); + TRACE("(%p/%p)->(%p)\n", This, iface, plVolume); + if (!plVolume) + return E_POINTER; + + *plVolume = This->volume; return S_OK; } @@ -819,8 +845,17 @@ static HRESULT WINAPI Basicaudio_put_Balance(IBasicAudio *iface, long lBalance) { ICOM_THIS_MULTI(DSoundRenderImpl, IBasicAudio_vtbl, iface); - TRACE("(%p/%p)->(%ld): stub !!!\n", This, iface, lBalance); + TRACE("(%p/%p)->(%ld)\n", This, iface, lBalance); + + if (lBalance < DSBPAN_LEFT || lBalance > DSBPAN_RIGHT) + return E_INVALIDARG; + + if (This->dsbuffer) { + if (FAILED(IDirectSoundBuffer_SetPan(This->dsbuffer, lBalance))) + return E_FAIL; + } + This->pan = lBalance; return S_OK; } @@ -828,8 +863,12 @@ static HRESULT WINAPI Basicaudio_get_Balance(IBasicAudio *iface, long *plBalance) { ICOM_THIS_MULTI(DSoundRenderImpl, IBasicAudio_vtbl, iface); - TRACE("(%p/%p)->(%p): stub !!!\n", This, iface, plBalance); + TRACE("(%p/%p)->(%p)\n", This, iface, plBalance); + + if (!plBalance) + return E_POINTER; + *plBalance = This->pan; return S_OK; }

1 0

Chris Robinson : quartz: Make DSoundRender_Run start the playback buffer.
by Alexandre Julliard March 26, 2007

March 26, 2007

Module: wine Branch: master Commit: a7151d885139fcf7a4b2ea2ef8a25e05794b7164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7151d885139fcf7a4b2ea2ef… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Sat Mar 24 17:43:57 2007 -0700 quartz: Make DSoundRender_Run start the playback buffer. --- dlls/quartz/dsoundrender.c | 44 +++++++++++++++++++++++--------------------- 1 files changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 5e84e21..a060ddc 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -66,7 +66,6 @@ typedef struct DSoundRenderImpl LPDIRECTSOUNDBUFFER dsbuffer; DWORD write_pos; BOOL init; - BOOL started; } DSoundRenderImpl; static HRESULT DSoundRender_InputPin_Construct(const PIN_INFO * pPinInfo, SAMPLEPROC pSampleProc, LPVOID pUserData, QUERYACCEPTPROC pQueryAccept, LPCRITICAL_SECTION pCritSec, IPin ** ppPin) @@ -150,6 +149,13 @@ static HRESULT DSoundRender_CreateSoundBuffer(IBaseFilter * iface) IDirectSound_Release(This->dsound); return hr; } + hr = IDirectSoundBuffer_Play(This->dsbuffer, 0, 0, DSBPLAY_LOOPING); + if (FAILED(hr)) { + ERR("Can't start sound buffer (%x)!\n", hr); + IDirectSoundBuffer_Release(This->dsbuffer); + IDirectSound_Release(This->dsound); + return hr; + } This->write_pos = 0; @@ -166,8 +172,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, DWORD size2; DWORD play_pos,buf_free; - while (1) - { + do { hr = IDirectSoundBuffer_GetCurrentPosition(This->dsbuffer, &play_pos, NULL); if (hr != DS_OK) { @@ -180,7 +185,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, buf_free = DSBUFFERSIZE - This->write_pos + play_pos; /* This situation is ambiguous; Assume full when playing */ - if(buf_free == DSBUFFERSIZE && This->started) + if(buf_free == DSBUFFERSIZE) { Sleep(10); continue; @@ -201,14 +206,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, hr = IDirectSoundBuffer_Unlock(This->dsbuffer, lpbuf1, dwsize1, lpbuf2, dwsize2); if (hr != DS_OK) ERR("Unable to unlock sound buffer! (%x)\n", hr); - if (!This->started) - { - hr = IDirectSoundBuffer_Play(This->dsbuffer, 0, 0, DSBPLAY_LOOPING); - if (hr == DS_OK) - This->started = TRUE; - else - ERR("Can't start playing! (%x)\n", hr); - } + size -= dwsize1 + dwsize2; data += dwsize1 + dwsize2; This->write_pos = (This->write_pos + dwsize1 + dwsize2) % DSBUFFERSIZE; @@ -216,7 +214,7 @@ static HRESULT DSoundRender_SendSampleData(DSoundRenderImpl* This, LPBYTE data, if (!size) break; Sleep(10); - } + } while (This->state == State_Running); return hr; } @@ -469,10 +467,7 @@ static HRESULT WINAPI DSoundRender_Stop(IBaseFilter * iface) } } if (SUCCEEDED(hr)) - { - This->started = FALSE; This->state = State_Stopped; - } } LeaveCriticalSection(&This->csFilter); @@ -499,10 +494,7 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) } } if (SUCCEEDED(hr)) - { - This->started = FALSE; This->state = State_Paused; - } } LeaveCriticalSection(&This->csFilter); @@ -518,8 +510,18 @@ static HRESULT WINAPI DSoundRender_Run(IBaseFilter * iface, REFERENCE_TIME tStar EnterCriticalSection(&This->csFilter); { - This->rtStreamStart = tStart; - This->state = State_Running; + /* It's okay if there's no buffer yet. It'll start when it's created */ + if (This->dsbuffer) + { + hr = IDirectSoundBuffer_Play(This->dsbuffer, 0, 0, DSBPLAY_LOOPING); + if (FAILED(hr)) + ERR("Can't start playing! (%x)\n", hr); + } + if (SUCCEEDED(hr)) + { + This->rtStreamStart = tStart; + This->state = State_Running; + } } LeaveCriticalSection(&This->csFilter);

1 0