August 2009 - Wine-commits - list.winehq.org

Jeff Latimer : ws2_32: Add the scope_id to the IPv6 address string if present.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: f40cbb3d77fc062b6cc3254e351c42d6ceaf19e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f40cbb3d77fc062b6cc3254e3… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Jul 28 19:40:39 2009 +1000 ws2_32: Add the scope_id to the IPv6 address string if present. --- dlls/ws2_32/socket.c | 2 ++ dlls/ws2_32/tests/sock.c | 12 ------------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index b4df86f..837aad6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4967,6 +4967,8 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, WSASetLastError(WSAEINVAL); return SOCKET_ERROR; } + if ((sockaddr6->sin6_scope_id)) + sprintf(buffer+strlen(buffer), "%%%u", sockaddr6->sin6_scope_id); if ((sockaddr6->sin6_port)) sprintf(buffer+strlen(buffer), "]:%u", ntohs(sockaddr6->sin6_port)); break; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 44ed183..5db5bfe 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1442,11 +1442,8 @@ static void test_WSAAddressToStringA(void) ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); - todo_wine - { ok( !strcmp( address6, expect6_3_2 ), "Expected: %s, got: %s\n", expect6_3_2, address6 ); ok( len == sizeof(expect6_3_2), "Got size %d\n", len); - } /* Test IPv6 address and scope_id */ len = sizeof(address6); @@ -1458,11 +1455,8 @@ static void test_WSAAddressToStringA(void) ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); - todo_wine - { ok( !strcmp( address6, expect6_3_3 ), "Expected: %s, got: %s\n", expect6_3_3, address6 ); ok( len == sizeof(expect6_3_3), "Got size %d\n", len); - } end: if (v6 != INVALID_SOCKET) @@ -1613,11 +1607,8 @@ static void test_WSAAddressToStringW(void) ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); - todo_wine - { ok( !lstrcmpW( address6, expect6_3_2 ), "Wrong string returned\n" ); ok( len == sizeof(expect6_3_2)/sizeof(WCHAR), "Got %d\n", len); - } /* Test IPv6 address and scope_id */ len = sizeof(address6)/sizeof(WCHAR); @@ -1629,11 +1620,8 @@ static void test_WSAAddressToStringW(void) ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); - todo_wine - { ok( !lstrcmpW( address6, expect6_3_3 ), "Wrong string returned\n" ); ok( len == sizeof(expect6_3_3)/sizeof(WCHAR), "Got %d\n", len); - } end: if (v6 != INVALID_SOCKET)

1 0

Jeff Latimer : ws2_32: Add the port to the IPv6 address string if present.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 4028a0e9f06e5342d127bdca673c4793804e974a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4028a0e9f06e5342d127bdca6… Author: Jeff Latimer <lats(a)yless4u.com.au> Date: Tue Jul 28 19:39:42 2009 +1000 ws2_32: Add the port to the IPv6 address string if present. --- dlls/ws2_32/socket.c | 7 ++++++- dlls/ws2_32/tests/sock.c | 6 ------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a601521..b4df86f 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4958,12 +4958,17 @@ INT WINAPI WSAAddressToStringA( LPSOCKADDR sockaddr, DWORD len, { struct WS_sockaddr_in6 *sockaddr6 = (LPSOCKADDR_IN6) sockaddr; + buffer[0] = 0; if (len < sizeof(SOCKADDR_IN6)) return SOCKET_ERROR; - if (!WS_inet_ntop(WS_AF_INET6, &sockaddr6->sin6_addr, buffer, sizeof(buffer))) + if ((sockaddr6->sin6_port)) + strcpy(buffer, "["); + if (!WS_inet_ntop(WS_AF_INET6, &sockaddr6->sin6_addr, buffer+strlen(buffer), sizeof(buffer))) { WSASetLastError(WSAEINVAL); return SOCKET_ERROR; } + if ((sockaddr6->sin6_port)) + sprintf(buffer+strlen(buffer), "]:%u", ntohs(sockaddr6->sin6_port)); break; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b1b85fe..44ed183 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1429,11 +1429,8 @@ static void test_WSAAddressToStringA(void) ret = WSAAddressToStringA( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringA() failed unexpectedly: %d\n", WSAGetLastError() ); - todo_wine - { ok( !strcmp( address6, expect6_3 ), "Expected: %s, got: %s\n", expect6_3, address6 ); ok( len == sizeof(expect6_3), "Got size %d\n", len); - } /* Test IPv6 address, port number and scope_id */ len = sizeof(address6); @@ -1603,11 +1600,8 @@ static void test_WSAAddressToStringW(void) ret = WSAAddressToStringW( (SOCKADDR*)&sockaddr6, sizeof(sockaddr6), NULL, address6, &len ); ok( !ret, "WSAAddressToStringW() failed unexpectedly: %d\n", WSAGetLastError() ); - todo_wine - { ok( !lstrcmpW( address6, expect6_3 ), "Wrong string returned\n" ); ok( len == sizeof(expect6_3)/sizeof(WCHAR), "Got %d\n", len); - } /* Test IPv6 address, port number and scope_id */ len = sizeof(address6)/sizeof(WCHAR);

1 0

Austin English : userenv: Add a stub for LoadUserProfileW.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 4814d67ed5d7b471b05d1752da572ac52cfc07d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4814d67ed5d7b471b05d1752d… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Jul 25 18:52:58 2009 -0500 userenv: Add a stub for LoadUserProfileW. --- dlls/userenv/userenv.spec | 2 +- dlls/userenv/userenv_main.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/userenv/userenv.spec b/dlls/userenv/userenv.spec index cecde03..95280bf 100644 --- a/dlls/userenv/userenv.spec +++ b/dlls/userenv/userenv.spec @@ -8,7 +8,7 @@ @ stdcall GetUserProfileDirectoryA(ptr ptr ptr) @ stdcall GetUserProfileDirectoryW(ptr ptr ptr) @ stdcall LoadUserProfileA(ptr ptr) -@ stub LoadUserProfileW +@ stdcall LoadUserProfileW(ptr ptr) @ stdcall RegisterGPNotification(long long) @ stdcall UnloadUserProfile(ptr ptr) @ stdcall UnregisterGPNotification(long) diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 1eaaa71..01f3a1b 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -129,6 +129,13 @@ BOOL WINAPI LoadUserProfileA( HANDLE hToken, LPPROFILEINFOA lpProfileInfo ) return TRUE; } +BOOL WINAPI LoadUserProfileW( HANDLE hToken, LPPROFILEINFOW lpProfileInfo ) +{ + FIXME("%p %p\n", hToken, lpProfileInfo ); + lpProfileInfo->hProfile = HKEY_CURRENT_USER; + return TRUE; +} + BOOL WINAPI RegisterGPNotification( HANDLE event, BOOL machine ) { FIXME("%p %d\n", event, machine );

1 0

Alexandre Julliard : comctl32/tests: Fix some test failures on older versions.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 66e83d215673f518675478bd86b62282b3118145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66e83d215673f518675478bd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 5 14:00:03 2009 +0200 comctl32/tests: Fix some test failures on older versions. --- dlls/comctl32/tests/tab.c | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 3bf6894..5fc1577 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -89,13 +89,14 @@ static const struct message create_parent_wnd_seq[] = { static const struct message add_tab_to_parent[] = { { TCM_INSERTITEMA, sent }, - { TCM_INSERTITEMA, sent }, + { TCM_INSERTITEMA, sent|optional }, { WM_NOTIFYFORMAT, sent|defwinproc }, { WM_QUERYUISTATE, sent|wparam|lparam|defwinproc|optional, 0, 0 }, { WM_PARENTNOTIFY, sent|defwinproc }, { TCM_INSERTITEMA, sent }, { TCM_INSERTITEMA, sent }, { TCM_INSERTITEMA, sent }, + { TCM_INSERTITEMA, sent|optional }, { 0 } }; @@ -236,12 +237,15 @@ static const struct message insert_focus_seq[] = { { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { TCM_INSERTITEM, sent|wparam, 1 }, + { WM_NOTIFYFORMAT, sent|defwinproc|optional }, + { WM_QUERYUISTATE, sent|defwinproc|optional }, + { WM_PARENTNOTIFY, sent|defwinproc|optional }, { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { TCM_INSERTITEM, sent|wparam, 2 }, - { WM_NOTIFYFORMAT, sent|defwinproc, }, + { WM_NOTIFYFORMAT, sent|defwinproc|optional }, { WM_QUERYUISTATE, sent|defwinproc|optional, }, - { WM_PARENTNOTIFY, sent|defwinproc, }, + { WM_PARENTNOTIFY, sent|defwinproc|optional }, { TCM_GETITEMCOUNT, sent|wparam|lparam, 0, 0 }, { TCM_GETCURFOCUS, sent|wparam|lparam, 0, 0 }, { TCM_SETCURFOCUS, sent|wparam|lparam, -1, 0 }, @@ -505,7 +509,7 @@ static void test_tab(INT nMinTabWidth) SIZE size; HDC hdc; HFONT hOldFont; - INT i, dpi; + INT i, dpi, exp; hwTab = create_tabcontrol(TCS_FIXEDWIDTH, TCIF_TEXT|TCIF_IMAGE); SendMessage(hwTab, TCM_SETMINTABWIDTH, 0, nMinTabWidth); @@ -585,8 +589,11 @@ static void test_tab(INT nMinTabWidth) SendMessage(hwTab, TCM_SETMINTABWIDTH, 0, nMinTabWidth); trace (" non fixed width, with text...\n"); - CheckSize(hwTab, max(size.cx +TAB_PADDING_X*2, (nMinTabWidth < 0) ? DEFAULT_MIN_TAB_WIDTH : nMinTabWidth), -1, - "no icon, default width"); + exp = max(size.cx +TAB_PADDING_X*2, (nMinTabWidth < 0) ? DEFAULT_MIN_TAB_WIDTH : nMinTabWidth); + SendMessage( hwTab, TCM_GETITEMRECT, 0, (LPARAM)&rTab ); + ok( rTab.right - rTab.left == exp || broken(rTab.right - rTab.left == DEFAULT_MIN_TAB_WIDTH), + "no icon, default width: Expected width [%d] got [%d]\n", exp, rTab.right - rTab.left ); + for (i=0; i<8; i++) { INT nTabWidth = (nMinTabWidth < 0) ? TabWidthPadded(i, 2) : nMinTabWidth; @@ -610,7 +617,11 @@ static void test_tab(INT nMinTabWidth) SendMessage(hwTab, TCM_SETMINTABWIDTH, 0, nMinTabWidth); trace (" non fixed width, no text...\n"); - CheckSize(hwTab, (nMinTabWidth < 0) ? DEFAULT_MIN_TAB_WIDTH : nMinTabWidth, -1, "no icon, default width"); + exp = (nMinTabWidth < 0) ? DEFAULT_MIN_TAB_WIDTH : nMinTabWidth; + SendMessage( hwTab, TCM_GETITEMRECT, 0, (LPARAM)&rTab ); + ok( rTab.right - rTab.left == exp || broken(rTab.right - rTab.left == DEFAULT_MIN_TAB_WIDTH), + "no icon, default width: Expected width [%d] got [%d]\n", exp, rTab.right - rTab.left ); + for (i=0; i<8; i++) { INT nTabWidth = (nMinTabWidth < 0) ? TabWidthPadded(i, 2) : nMinTabWidth; @@ -960,7 +971,7 @@ static void test_insert_focus(HWND parent_wnd) r = SendMessage(hTab, TCM_GETCURFOCUS, 0, 0); expect(2, r); - ok_sequence(sequences, TAB_SEQ_INDEX, insert_focus_seq, "insert_focus test sequence", TRUE); + ok_sequence(sequences, TAB_SEQ_INDEX, insert_focus_seq, "insert_focus test sequence", FALSE); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_sequence, "insert_focus parent test sequence", FALSE); DestroyWindow(hTab);

1 0

Alexandre Julliard : kernel32/tests: Add one more possible error code.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 8c700d2b3b148fabdea86e64a18db81c727ee249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c700d2b3b148fabdea86e64a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 5 13:52:42 2009 +0200 kernel32/tests: Add one more possible error code. --- dlls/kernel32/tests/drive.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/drive.c b/dlls/kernel32/tests/drive.c index af1cf7f..e4cb26c 100644 --- a/dlls/kernel32/tests/drive.c +++ b/dlls/kernel32/tests/drive.c @@ -125,6 +125,7 @@ static void test_GetDiskFreeSpaceA(void) GetLastError() == ERROR_INVALID_DRIVE || GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_REQUEST_ABORTED || + GetLastError() == ERROR_NETNAME_DELETED || GetLastError() == ERROR_UNRECOGNIZED_VOLUME, "GetDiskFreeSpaceA(%s): ret=%d GetLastError=%d\n", drive, ret, GetLastError()); @@ -144,6 +145,7 @@ static void test_GetDiskFreeSpaceA(void) GetLastError() == ERROR_INVALID_FUNCTION || GetLastError() == ERROR_PATH_NOT_FOUND || GetLastError() == ERROR_REQUEST_ABORTED || + GetLastError() == ERROR_NETNAME_DELETED || GetLastError() == ERROR_UNRECOGNIZED_VOLUME, "GetDiskFreeSpaceExA( %s ) failed. GetLastError=%d\n", drive, GetLastError()); ok( bytes_per_sector == 0 || /* empty cd rom drive */

1 0

Vladimir Pankratov : wldap32: Convert the Russian resources to UTF-8.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: c574f6c42103624f187a9d6471426ae537726d5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c574f6c42103624f187a9d647… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Aug 5 15:34:39 2009 +0500 wldap32: Convert the Russian resources to UTF-8. --- dlls/wldap32/wldap32_Ru.rc | 123 ++++++++++++++++++++++--------------------- 1 files changed, 63 insertions(+), 60 deletions(-) diff --git a/dlls/wldap32/wldap32_Ru.rc b/dlls/wldap32/wldap32_Ru.rc index 48ff24f..9029b8a 100644 --- a/dlls/wldap32/wldap32_Ru.rc +++ b/dlls/wldap32/wldap32_Ru.rc @@ -20,32 +20,35 @@ #include "windef.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - 0 "��" - 1 "�� " - 2 "�� " - 3 "�� " - 4 "�� " - 5 "�� " - 6 "�� " - 7 "�� " - 8 "�� " - 9 "�� (v2)" - 10 "��" - 11 "�� " - 12 "�� " - 13 "�� " + 0 "Успех" + 1 "Ошибка операции" + 2 "Ошибка протокола" + 3 "Превышено ограничение по времени" + 4 "Превышено ограничение по размеру" + 5 "Сравнение неверно" + 6 "Сравнение верно" + 7 "Метод авторизации не поддерживается" + 8 "Требуется строгая авторизация" + 9 "Ссылка (v2)" + 10 "Ссылка" + 11 "Превышено ограничение администрирования" + 12 "Критическое расширение недоступно" + 13 "Требуется конфиденциальность" 14 "" 15 "" - 16 "�� " - 17 "�� " - 18 "�� " - 19 "�� " - 20 "�� " - 21 "�� " + 16 "Нет такого атрибута" + 17 "Неопределенный тип" + 18 "Неподходящее соответствие" + 19 "Нарушение ограничения" + 20 "Атрибут или значение существует" + 21 "Неверный синтаксис" 22 "" 23 "" 24 "" @@ -56,11 +59,11 @@ STRINGTABLE DISCARDABLE 29 "" 30 "" 31 "" - 32 "�� " - 33 "�� " - 34 "�� DN ��" - 35 "�� " - 36 "�� " + 32 "Нет такого объекта" + 33 "Проблема с псевдонимом" + 34 "Неверный DN синтаксис" + 35 "Это лист дерева" + 36 "Проблема обращения по псевдониму" 37 "" 38 "" 39 "" @@ -72,30 +75,30 @@ STRINGTABLE DISCARDABLE 45 "" 46 "" 47 "" - 48 "�� " - 49 "�� " - 50 "�� " - 51 "��" - 52 "��" - 53 "�� " - 54 "�� " + 48 "Неподходящая авторизация" + 49 "Неверное удостоверение личности" + 50 "Недостаточно прав" + 51 "Занято" + 52 "Недоступно" + 53 "Не желает выполнить" + 54 "Обнаружено зацикливание" 55 "" 56 "" 57 "" 58 "" 59 "" - 60 "�� " - 61 "�� " + 60 "Отсутствует управление сортировкой" + 61 "Ошибка диапазона индекса" 62 "" 63 "" - 64 "�� " - 65 "�� " - 66 "�� " - 67 "�� RDN" - 68 "�� " - 69 "�� " - 70 "�� " - 71 "�� DSA" + 64 "Нарушение правил наименования" + 65 "Нарушение класса объекта" + 66 "Не разрешено не на листе дерева" + 67 "Не разрешено на RDN" + 68 "Уже существует" + 69 "Нет режимов класса объекта" + 70 "Результаты слишком велики" + 71 "Влияет на несколько DSA" 72 "" 73 "" 74 "" @@ -104,22 +107,22 @@ STRINGTABLE DISCARDABLE 77 "" 78 "" 79 "" - 80 "��" - 81 "�� " - 82 "�� " - 83 "�� " - 84 "�� " - 85 "��-��" - 86 "�� " - 87 "�� " - 88 "�� " - 89 "�� " - 90 "�� " - 91 "�� LDAP ��" - 92 "�� LDAP" - 93 "�� " - 94 "�� " - 95 "�� " - 96 "�� " - 97 "�� " + 80 "Другой" + 81 "Сервер недоступен" + 82 "Локальная ошибка" + 83 "Ошибка кодирования" + 84 "Ошибка декодирования" + 85 "Тайм-аут" + 86 "Неизвестная авторизация" + 87 "Ошибка фильтра" + 88 "Отменено пользователем" + 89 "Ошибка параметра" + 90 "Нет памяти" + 91 "Невозможно подключиться к LDAP серверу" + 92 "Операция не поддерживается этой версией протокола LDAP" + 93 "Указанный управляющий элемент не найден в сообщении" + 94 "Результата нет в сообщении" + 95 "Еще есть результаты" + 96 "Зацикливание при обработке ссылок" + 97 "Предел числа пересылки ссылок превышен" }

1 0

Vladimir Pankratov : winspool.drv: Convert the Russian resources to UTF-8.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 148551f900743ae04914796dd9249da79a9f7d7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=148551f900743ae04914796dd… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Aug 5 15:34:32 2009 +0500 winspool.drv: Convert the Russian resources to UTF-8. --- dlls/winspool.drv/Ru.rc | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/winspool.drv/Ru.rc b/dlls/winspool.drv/Ru.rc index 0a8481f..c9b7c45 100644 --- a/dlls/winspool.drv/Ru.rc +++ b/dlls/winspool.drv/Ru.rc @@ -20,22 +20,25 @@ #include "wspool.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "�� " +CAPTION "Печать в файл" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&�� :", -1, 7, 13, 194, 13, WS_VISIBLE + LTEXT "&Имя файла:", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE - PUSHBUTTON "��", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE + PUSHBUTTON "Отмена", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE END STRINGTABLE DISCARDABLE { - IDS_CAPTION "�� " - IDS_FILE_EXISTS "�� . �� OK �� ." - IDS_CANNOT_OPEN "�� ." + IDS_CAPTION "Локальный порт" + IDS_FILE_EXISTS "Такой файл уже существует. Нажмите OK для его замены." + IDS_CANNOT_OPEN "Невозможно создать выходной файл." }

1 0

Vladimir Pankratov : winmm: Convert the Russian resources to UTF-8.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 590bb3507937ec676c168ec6b9cbceae3ec564e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=590bb3507937ec676c168ec6b… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Aug 5 15:33:57 2009 +0500 winmm: Convert the Russian resources to UTF-8. --- dlls/winmm/winmm_Ru.rc | 197 ++++++++++++++++++++++++------------------------ 1 files changed, 100 insertions(+), 97 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=590bb3507937ec676c168…

1 0

Juan Lang : crypt32: Fix leak on error path.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 90d7172bcbf034a18b713f51355b37584ab53b51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=90d7172bcbf034a18b713f513… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 4 11:51:01 2009 -0700 crypt32: Fix leak on error path. Spotted by Chris Ahrendt. --- dlls/crypt32/rootstore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/rootstore.c b/dlls/crypt32/rootstore.c index a2ed6e5..bd6dfac 100644 --- a/dlls/crypt32/rootstore.c +++ b/dlls/crypt32/rootstore.c @@ -339,9 +339,9 @@ static BOOL import_certs_from_dir(LPCSTR path, HCERTSTORE store) ret = TRUE; } } - closedir(dir); CryptMemFree(filebuf); } + closedir(dir); } return ret; #else

1 0

Vincent Povirk : windowscodecs: Add test for IWICImagingFactory:: CreateDecoderFromStream.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 100546686c8adb94d5b8a61fcab557c9fadd344f URL: http://source.winehq.org/git/wine.git/?a=commit;h=100546686c8adb94d5b8a61fc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jul 28 17:21:42 2009 -0500 windowscodecs: Add test for IWICImagingFactory::CreateDecoderFromStream. --- dlls/windowscodecs/tests/bmpformat.c | 49 ++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/tests/bmpformat.c b/dlls/windowscodecs/tests/bmpformat.c index 6f6b83a..39bb3b4 100644 --- a/dlls/windowscodecs/tests/bmpformat.c +++ b/dlls/windowscodecs/tests/bmpformat.c @@ -986,6 +986,54 @@ static void test_componentinfo(void) } } +static void test_createfromstream(void) +{ + IWICBitmapDecoder *decoder; + IWICImagingFactory *factory; + HRESULT hr; + HGLOBAL hbmpdata; + char *bmpdata; + IStream *bmpstream; + GUID guidresult; + + hr = CoCreateInstance(&CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICImagingFactory, (void**)&factory); + ok(SUCCEEDED(hr), "CoCreateInstance failed, hr=%x\n", hr); + if (!SUCCEEDED(hr)) return; + + hbmpdata = GlobalAlloc(GMEM_MOVEABLE, sizeof(testbmp_1bpp)); + ok(hbmpdata != 0, "GlobalAlloc failed\n"); + if (hbmpdata) + { + bmpdata = GlobalLock(hbmpdata); + memcpy(bmpdata, testbmp_1bpp, sizeof(testbmp_1bpp)); + GlobalUnlock(hbmpdata); + + hr = CreateStreamOnHGlobal(hbmpdata, FALSE, &bmpstream); + ok(SUCCEEDED(hr), "CreateStreamOnHGlobal failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICImagingFactory_CreateDecoderFromStream(factory, bmpstream, + NULL, WICDecodeMetadataCacheOnDemand, &decoder); + ok(SUCCEEDED(hr), "CreateDecoderFromStream failed, hr=%x\n", hr); + if (SUCCEEDED(hr)) + { + hr = IWICBitmapDecoder_GetContainerFormat(decoder, &guidresult); + ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatBmp), "unexpected container format\n"); + + IWICBitmapDecoder_Release(decoder); + } + + IStream_Release(bmpstream); + } + + GlobalFree(hbmpdata); + } + + IWICImagingFactory_Release(factory); +} + START_TEST(bmpformat) { CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); @@ -996,6 +1044,7 @@ START_TEST(bmpformat) test_decode_rle8(); test_decode_rle4(); test_componentinfo(); + test_createfromstream(); CoUninitialize(); }

1 0