wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Gerald Pfeifer : user32: Removed some code that is unused after revision 751a09e9839d7273895df24666a0bb2fb51a29c7 .
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: 8c7e2f99dbb283ade9f924aea5af971e20a70d9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c7e2f99dbb283ade9f924aea… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Oct 12 22:12:51 2010 +0200 user32: Removed some code that is unused after revision 751a09e9839d7273895df24666a0bb2fb51a29c7. --- dlls/user32/cursoricon.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 82360a2..9732db6 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1199,7 +1199,6 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, CURSORICONDIRENTRY *dirEntry; LPBYTE bits; WORD wResId; - DWORD dwBytesInRes; POINT hotspot; TRACE("%p, %s, %dx%d, depth %d, fCursor %d, flags 0x%04x\n", @@ -1229,7 +1228,6 @@ static HICON CURSORICON_Load(HINSTANCE hInstance, LPCWSTR name, dirEntry = CURSORICON_FindBestIconRes( dir, width, height, depth ); if (!dirEntry) return 0; wResId = dirEntry->wResId; - dwBytesInRes = dirEntry->dwBytesInRes; FreeResource( handle ); /* Load the resource */

1 0

Piotr Caban : msvcr90: Added __tzname implementation.
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: 938fa8bbbc0932dd8bf39f8ed9c8f34c595272f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=938fa8bbbc0932dd8bf39f8ed… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 12 22:22:33 2010 +0200 msvcr90: Added __tzname implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 60211ab..7437db4 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -475,7 +475,7 @@ @ cdecl __threadid() msvcrt.__threadid @ stub __timezone @ cdecl __toascii(long) msvcrt.__toascii -@ stub __tzname +@ cdecl __tzname() msvcrt.__p__tzname @ cdecl __unDName(ptr str long ptr ptr long) msvcrt.__unDName @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx @ stub __unDNameHelper diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 4b0363f..1921c51 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -299,7 +299,7 @@ @ cdecl __threadid() msvcrt.__threadid @ stub __timezone @ cdecl __toascii(long) msvcrt.__toascii -@ stub __tzname +@ cdecl __tzname() msvcrt.__p__tzname @ cdecl __unDName(ptr str long ptr ptr long) msvcrt.__unDName @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx @ stub __unDNameHelper diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 967db82..6900317 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -291,7 +291,7 @@ @ cdecl __threadid() msvcrt.__threadid @ stub __timezone @ cdecl __toascii(long) msvcrt.__toascii -@ stub __tzname +@ cdecl __tzname() msvcrt.__p__tzname @ cdecl __unDName(ptr str long ptr ptr long) msvcrt.__unDName @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx @ stub __unDNameHelper

1 0

Juan Lang : iphlpapi: Return DNS suffix for all non-loopback adapters.
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: 39340a102790a44f00f47ac1c5fab54b9e32a722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39340a102790a44f00f47ac1c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Oct 11 11:02:23 2010 -0700 iphlpapi: Return DNS suffix for all non-loopback adapters. --- dlls/iphlpapi/iphlpapi_main.c | 63 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 5cefd4a..84ed558 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -968,11 +968,56 @@ static ULONG get_dns_server_addresses(PIP_ADAPTER_DNS_SERVER_ADDRESS address, UL return ERROR_SUCCESS; } +static BOOL is_ip_address_string(const char *str) +{ + struct in_addr in; + int ret; + + ret = inet_aton(str, &in); + return ret != 0; +} + +static ULONG get_dns_suffix(WCHAR *suffix, ULONG *len) +{ + ULONG size, i; + char *found_suffix = NULL; + + initialise_resolver(); + /* Always return a NULL-terminated string, even if it's empty. */ + size = sizeof(WCHAR); + for (i = 0, found_suffix = NULL; + !found_suffix && i < MAXDNSRCH + 1 && _res.dnsrch[i]; i++) + { + /* This uses a heuristic to select a DNS suffix: + * the first, non-IP address string is selected. + */ + if (!is_ip_address_string(_res.dnsrch[i])) + found_suffix = _res.dnsrch[i]; + } + if (found_suffix) + size += strlen(found_suffix) * sizeof(WCHAR); + if (!suffix || *len < size) + { + *len = size; + return ERROR_BUFFER_OVERFLOW; + } + *len = size; + if (found_suffix) + { + char *p; + + for (p = found_suffix; *p; p++) + *suffix++ = *p; + } + *suffix = 0; + return ERROR_SUCCESS; +} + ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, PIP_ADAPTER_ADDRESSES aa, PULONG buflen) { InterfaceIndexTable *table; - ULONG i, size, dns_server_size, total_size, ret = ERROR_NO_DATA; + ULONG i, size, dns_server_size, dns_suffix_size, total_size, ret = ERROR_NO_DATA; TRACE("(%d, %08x, %p, %p, %p)\n", family, flags, reserved, aa, buflen); @@ -1003,11 +1048,17 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, get_dns_server_addresses(NULL, &dns_server_size); total_size += dns_server_size; } + /* Since DNS suffix also isn't really per adapter, get enough space for a + * single copy of it. + */ + get_dns_suffix(NULL, &dns_suffix_size); + total_size += dns_suffix_size; if (aa && *buflen >= total_size) { ULONG bytes_left = size = total_size; PIP_ADAPTER_ADDRESSES first_aa = aa; PIP_ADAPTER_DNS_SERVER_ADDRESS firstDns; + WCHAR *dnsSuffix; for (i = 0; i < table->numIndexes; i++) { @@ -1025,7 +1076,7 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, } if (!(flags & GAA_FLAG_SKIP_DNS_SERVER)) { - firstDns = (PIP_ADAPTER_DNS_SERVER_ADDRESS)((BYTE *)aa + total_size - dns_server_size); + firstDns = (PIP_ADAPTER_DNS_SERVER_ADDRESS)((BYTE *)aa + total_size - dns_server_size - dns_suffix_size); get_dns_server_addresses(firstDns, &dns_server_size); for (aa = first_aa; aa; aa = aa->Next) { @@ -1033,6 +1084,14 @@ ULONG WINAPI GetAdaptersAddresses(ULONG family, ULONG flags, PVOID reserved, aa->FirstDnsServerAddress = firstDns; } } + aa = first_aa; + dnsSuffix = (WCHAR *)((BYTE *)aa + total_size - dns_suffix_size); + get_dns_suffix(dnsSuffix, &dns_suffix_size); + for (; aa; aa = aa->Next) + { + if (aa->IfType != IF_TYPE_SOFTWARE_LOOPBACK && aa->OperStatus == IfOperStatusUp) + aa->DnsSuffix = dnsSuffix; + } ret = ERROR_SUCCESS; } if (*buflen < total_size) ret = ERROR_BUFFER_OVERFLOW;

1 0

Alexandre Julliard : user32: Improve error checking in GetIconInfo.
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: 19eea5fa6b27a99c3a3d565554b54edc3f26fc18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19eea5fa6b27a99c3a3d56555… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 12 23:24:11 2010 +0200 user32: Improve error checking in GetIconInfo. --- dlls/user32/cursoricon.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 1d440db..82360a2 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -285,19 +285,22 @@ static int bitmap_info_size( const BITMAPINFO * info, WORD coloruse ) */ static HBITMAP copy_bitmap( HBITMAP bitmap ) { - HDC src, dst; - HBITMAP new_bitmap; + HDC src, dst = 0; + HBITMAP new_bitmap = 0; BITMAP bmp; if (!bitmap) return 0; if (!GetObjectW( bitmap, sizeof(bmp), &bmp )) return 0; - src = CreateCompatibleDC( 0 ); - dst = CreateCompatibleDC( 0 ); - SelectObject( src, bitmap ); - new_bitmap = CreateCompatibleBitmap( src, bmp.bmWidth, bmp.bmHeight ); - SelectObject( dst, new_bitmap ); - BitBlt( dst, 0, 0, bmp.bmWidth, bmp.bmHeight, src, 0, 0, SRCCOPY ); + if ((src = CreateCompatibleDC( 0 )) && (dst = CreateCompatibleDC( 0 ))) + { + SelectObject( src, bitmap ); + if ((new_bitmap = CreateCompatibleBitmap( src, bmp.bmWidth, bmp.bmHeight ))) + { + SelectObject( dst, new_bitmap ); + BitBlt( dst, 0, 0, bmp.bmWidth, bmp.bmHeight, src, 0, 0, SRCCOPY ); + } + } DeleteDC( dst ); DeleteDC( src ); return new_bitmap; @@ -1685,6 +1688,7 @@ BOOL WINAPI GetIconInfoExA( HICON icon, ICONINFOEXA *info ) BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) { struct cursoricon_object *ptr; + BOOL ret = TRUE; if (info->cbSize != sizeof(*info)) { @@ -1713,8 +1717,14 @@ BOOL WINAPI GetIconInfoExW( HICON icon, ICONINFOEXW *info ) if (IS_INTRESOURCE( ptr->resname )) info->wResID = LOWORD( ptr->resname ); else lstrcpynW( info->szResName, ptr->resname, MAX_PATH ); } + if (!info->hbmMask || (!info->hbmColor && ptr->frames[0].color)) + { + DeleteObject( info->hbmMask ); + DeleteObject( info->hbmColor ); + ret = FALSE; + } release_icon_ptr( icon, ptr ); - return TRUE; + return ret; } /* copy an icon bitmap, even when it can't be selected into a DC */

1 0

Alexandre Julliard : user32: Fix a DC leak in DrawIconEx.
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: bb8590f6ce0be06df712653c3222ba97efcbbd6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb8590f6ce0be06df712653c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 12 21:51:37 2010 +0200 user32: Fix a DC leak in DrawIconEx. --- dlls/user32/cursoricon.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index d2219d2..1d440db 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1880,18 +1880,18 @@ BOOL WINAPI DrawIconEx( HDC hdc, INT x0, INT y0, HICON hIcon, hdc,x0,y0,hIcon,cxWidth,cyWidth,istep,hbr,flags ); if (!(ptr = get_icon_ptr( hIcon ))) return FALSE; - if (!(hMemDC = CreateCompatibleDC( hdc ))) + if (istep >= ptr->num_frames) { + TRACE_(icon)("Stepped past end of animated frames=%d\n", istep); release_icon_ptr( hIcon, ptr ); return FALSE; } - - if (istep >= ptr->num_frames) + if (!(hMemDC = CreateCompatibleDC( hdc ))) { - TRACE_(icon)("Stepped past end of animated frames=%d\n", istep); release_icon_ptr( hIcon, ptr ); return FALSE; } + if (flags & DI_NOMIRROR) FIXME_(icon)("Ignoring flag DI_NOMIRROR\n");

1 0

Alexandre Julliard : gdi32: Improve tracing of GDI objects to make leaks easier to spot.
by Alexandre Julliard 13 Oct '10

13 Oct '10

Module: wine Branch: master Commit: f75b7e878833946f53c25310c260d6960a4d05a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f75b7e878833946f53c25310c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 12 21:53:38 2010 +0200 gdi32: Improve tracing of GDI objects to make leaks easier to spot. --- dlls/gdi32/gdiobj.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index a941e2b..196ebc9 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -635,6 +635,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) #define MAX_LARGE_HANDLES ((GDI_HEAP_SIZE >> 2) - FIRST_LARGE_HANDLE) static GDIOBJHDR *large_handles[MAX_LARGE_HANDLES]; static int next_large_handle; +static LONG debug_count; static const char *gdi_obj_type( unsigned type ) { @@ -712,6 +713,9 @@ HGDIOBJ alloc_gdi_handle( GDIOBJHDR *obj, WORD type, const struct gdi_obj_funcs large_handles[i] = obj; next_large_handle = i; LeaveCriticalSection( &gdi_section ); + TRACE( "allocated %s %p %u/%u\n", + gdi_obj_type(type), (HGDIOBJ)(ULONG_PTR)((i + FIRST_LARGE_HANDLE) << 2), + InterlockedIncrement( &debug_count ), MAX_LARGE_HANDLES ); return (HGDIOBJ)(ULONG_PTR)((i + FIRST_LARGE_HANDLE) << 2); } @@ -736,6 +740,8 @@ void *free_gdi_handle( HGDIOBJ handle ) } if (object) { + TRACE( "freed %s %p %u/%u\n", gdi_obj_type( object->type ), handle, + InterlockedDecrement( &debug_count ) + 1, MAX_LARGE_HANDLES ); object->type = 0; /* mark it as invalid */ object->funcs = NULL; } @@ -769,7 +775,6 @@ void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) LeaveCriticalSection( &gdi_section ); WARN( "Invalid handle %p\n", handle ); } - else TRACE("(%p): enter %d\n", handle, gdi_section.RecursionCount); return ptr; } @@ -781,7 +786,6 @@ void *GDI_GetObjPtr( HGDIOBJ handle, WORD type ) */ void GDI_ReleaseObj( HGDIOBJ handle ) { - TRACE("(%p): leave %d\n", handle, gdi_section.RecursionCount); LeaveCriticalSection( &gdi_section ); }

1 0

André Hentschel : Wine 1.2.1 freigegeben
by Jeremy Newman 12 Oct '10

12 Oct '10

Module: website Branch: master Commit: 82dc704cd02c56a0cd2f4a963423a4b39bed512d URL: http://source.winehq.org/git/website.git/?a=commit;h=82dc704cd02c56a0cd2f4a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sat Oct 9 16:30:22 2010 +0200 Wine 1.2.1 freigegeben --- news/de/2010100801.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/de/2010100801.xml b/news/de/2010100801.xml new file mode 100644 index 0000000..fd50b6d --- /dev/null +++ b/news/de/2010100801.xml @@ -0,0 +1,13 @@ +<news> +<date>8. Oktober 2010</date> +<title>Wine 1.2.1 freigegeben</title> +<body> + Die Entwicklungsversion 1.2.1 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.2.1">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Updates in den Übersetzungen.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.2.1.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Yaron Shahrabani : credui: Added Hebrew translation.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 5019592070a8aa61c9f730d01d67f99c2aee6647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5019592070a8aa61c9f730d01… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Fri Oct 8 09:03:11 2010 +0200 credui: Added Hebrew translation. --- dlls/credui/Makefile.in | 1 + dlls/credui/credui_He.rc | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/credui/Makefile.in b/dlls/credui/Makefile.in index 7452196..b43e147 100644 --- a/dlls/credui/Makefile.in +++ b/dlls/credui/Makefile.in @@ -12,6 +12,7 @@ RC_SRCS = \ credui_En.rc \ credui_Es.rc \ credui_Fr.rc \ + credui_He.rc \ credui_Hu.rc \ credui_It.rc \ credui_Ko.rc \ diff --git a/dlls/credui/credui_He.rc b/dlls/credui/credui_He.rc new file mode 100644 index 0000000..b2412f8 --- /dev/null +++ b/dlls/credui/credui_He.rc @@ -0,0 +1,56 @@ +/* + * ׁHebrew language resource file for Credentials UI + * + * Copyright 2007 Robert Shearman (for CodeWeavers) + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * 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 "credui_resources.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_CREDDIALOG DIALOG 0, 0, 213, 149 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "IDS_TITLEFORMAT" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL IDB_BANNER,-1,"Static",SS_BITMAP | SS_CENTERIMAGE,0, + 0,213,37 + LTEXT "IDS_MESSAGEFORMAT",IDC_MESSAGE,8,48,199,8,NOT WS_GROUP + LTEXT "&שם המשתמש:",-1,8,62,72,12,SS_CENTERIMAGE + CONTROL "",IDC_USERNAME,"ComboBoxEx32",CBS_DROPDOWN | + CBS_NOINTEGRALHEIGHT | WS_TABSTOP,80,62,126,87 + LTEXT "&ססמה:",-1,8,80,72,12,SS_CENTERIMAGE + EDITTEXT IDC_PASSWORD,80,80,126,12,ES_PASSWORD | ES_AUTOHSCROLL + CONTROL "&שמירת הססמה שלי",IDC_SAVE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,80,98,126,12 + DEFPUSHBUTTON "אישור",IDOK,97,128,50,14 + PUSHBUTTON "ביטול",IDCANCEL,156,128,50,14 +END + +STRINGTABLE +{ + IDS_TITLEFORMAT "התחברות אל %s" + IDS_MESSAGEFORMAT "בהליכי התחברות אל %s" + IDS_INCORRECTPASSWORDTITLE "הכניסה נכשלה" + IDS_INCORRECTPASSWORD "נא לוודא כי שם המשתמש\nוהססמה שלך נכונים." + IDS_CAPSLOCKONTITLE "ה־Caps Lock פעיל" + IDS_CAPSLOCKON "כאשר מקש ה־Caps Lock פעיל יתכן שהזנת ססמה לא נכונה.\n\nנא ללחוץ על מקש ה־Caps Lock במקלדת שלך כדי לכבות את ה־Caps Lock בטרם\nהזנת הססמה שלך." +}

1 0

Yaron Shahrabani : wininet: Added Hebrew translation.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: 17d8c5fbee26d403a0e8e81f97ae020aebbe010e URL: http://source.winehq.org/git/wine.git/?a=commit;h=17d8c5fbee26d403a0e8e81f9… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Fri Oct 8 10:28:45 2010 +0200 wininet: Added Hebrew translation. --- dlls/wininet/Makefile.in | 1 + dlls/wininet/wininet_He.rc | 71 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/Makefile.in b/dlls/wininet/Makefile.in index ecbf92d..6b17184 100644 --- a/dlls/wininet/Makefile.in +++ b/dlls/wininet/Makefile.in @@ -28,6 +28,7 @@ RC_SRCS = \ wininet_Es.rc \ wininet_Fi.rc \ wininet_Fr.rc \ + wininet_He.rc \ wininet_Hu.rc \ wininet_It.rc \ wininet_Ja.rc \ diff --git a/dlls/wininet/wininet_He.rc b/dlls/wininet/wininet_He.rc new file mode 100644 index 0000000..2a739d4 --- /dev/null +++ b/dlls/wininet/wininet_He.rc @@ -0,0 +1,71 @@ +/* + * Copyright 2003 Mike McCormack for CodeWeavers + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * 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 "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +IDD_PROXYDLG DIALOG 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "נא להזין את ססמת הרשת" +FONT 8, "MS Shell Dlg" +{ + LTEXT "נא להזין את שם המשתמש והססמה שלך:", -1, 40, 6, 150, 15 + LTEXT "מתווך", -1, 40, 26, 50, 10 + LTEXT "תחום", -1, 40, 46, 50, 10 + LTEXT "שם משתמש", -1, 40, 66, 50, 10 + LTEXT "ססמה", -1, 40, 86, 50, 10 + LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&שמירת ססמה זו (לא מאובטח)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "אישור", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "ביטול", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +IDD_AUTHDLG DIALOG 36, 24, 250, 154 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "נדרש אימות" +FONT 8, "MS Shell Dlg" +{ + LTEXT "נא להזין את שם המשתמש והססמה שלך:", -1, 40, 6, 150, 15 + LTEXT "שרת", -1, 40, 26, 50, 10 + LTEXT "תחום", -1, 40, 46, 50, 10 + LTEXT "שם משתמש", -1, 40, 66, 50, 10 + LTEXT "ססמה", -1, 40, 86, 50, 10 + LTEXT "" IDC_SERVER, 80, 26, 150, 14, 0 + LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 + EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&שמירת ססמה זו (לא מאובטח)", IDC_SAVEPASSWORD, + 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "אישור", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "ביטול", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP +} + +STRINGTABLE +{ + IDS_LANCONNECTION "חיבור לרשת מקומית" +}

1 0

Piotr Caban : shlwapi/tests: Add more tests.
by Alexandre Julliard 12 Oct '10

12 Oct '10

Module: wine Branch: master Commit: fd10f47de4e46ebe81fcea63078f0a1c0eac12c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd10f47de4e46ebe81fcea630… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 12 16:37:37 2010 +0200 shlwapi/tests: Add more tests. --- dlls/shlwapi/tests/ordinal.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 1937cb0..17ff367 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -62,6 +62,10 @@ static HRESULT (WINAPI *pSHIShellFolder_EnumObjects)(LPSHELLFOLDER, HWND, SHCONT static DWORD (WINAPI *pSHGetIniStringW)(LPCWSTR, LPCWSTR, LPWSTR, DWORD, LPCWSTR); static BOOL (WINAPI *pSHSetIniStringW)(LPCWSTR, LPCWSTR, LPCWSTR, LPCWSTR); static HKEY (WINAPI *pSHGetShellKey)(DWORD, LPCWSTR, BOOL); +static HRESULT (WINAPI *pSKGetValueW)(DWORD, LPCWSTR, LPCWSTR, DWORD*, void*, DWORD*); +static HRESULT (WINAPI *pSKSetValueW)(DWORD, LPCWSTR, LPCWSTR, DWORD, void*, DWORD); +static HRESULT (WINAPI *pSKDeleteValueW)(DWORD, LPCWSTR, LPCWSTR); +static HRESULT (WINAPI *pSKAllocValueW)(DWORD, LPCWSTR, LPCWSTR, DWORD*, void**, DWORD*); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -2701,7 +2705,9 @@ static void test_SHGetShellKey(void) static const WCHAR WineTestW[] = { 'W','i','n','e','T','e','s','t',0 }; void *pPathBuildRootW = GetProcAddress(hShlwapi, "PathBuildRootW"); + DWORD *alloc_data, data, size; HKEY hkey; + HRESULT hres; if (!pSHGetShellKey) { @@ -2754,6 +2760,50 @@ static void test_SHGetShellKey(void) ok(hkey != NULL, "Can't create key\n"); ok(SUCCEEDED(RegDeleteKeyW(hkey, WineTestW)), "Can't delte key\n"); RegCloseKey(hkey); + + if (!pSKGetValueW || !pSKSetValueW || !pSKDeleteValueW || !pSKAllocValueW) + { + win_skip("SKGetValueW, SKSetValueW, SKDeleteValueW or SKAllocValueW not available\n"); + return; + } + + hres = pSKGetValueW(SHKEY_Root_HKLM, WineTestW, NULL, NULL, &data, &size); + ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "hres = %x\n", hres); + + data = 1234; + hres = pSKSetValueW(SHKEY_Root_HKLM, WineTestW, NULL, REG_DWORD, &data, sizeof(DWORD)); + ok(hres == S_OK, "hres = %x\n", hres); + + size = 1; + hres = pSKGetValueW(SHKEY_Root_HKLM, WineTestW, NULL, NULL, NULL, &size); + ok(hres == S_OK, "hres = %x\n", hres); + ok(size == sizeof(DWORD), "size = %d\n", size); + + data = 0xdeadbeef; + hres = pSKGetValueW(SHKEY_Root_HKLM, WineTestW, NULL, NULL, &data, &size); + ok(hres == S_OK, "hres = %x\n", hres); + ok(size == sizeof(DWORD), "size = %d\n", size); + ok(data == 1234, "data = %d\n", data); + + hres = pSKAllocValueW(SHKEY_Root_HKLM, WineTestW, NULL, NULL, (void**)&alloc_data, &size); + ok(hres == S_OK, "hres= %x\n", hres); + ok(size == sizeof(DWORD), "size = %d\n", size); + ok(*alloc_data == 1234, "*alloc_data = %d\n", *alloc_data); + LocalFree(alloc_data); + + hres = pSKDeleteValueW(SHKEY_Root_HKLM, WineTestW, NULL); + ok(hres == S_OK, "hres = %x\n", hres); + + hres = pSKDeleteValueW(SHKEY_Root_HKLM, WineTestW, NULL); + ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "hres = %x\n", hres); + + hres = pSKGetValueW(SHKEY_Root_HKLM, WineTestW, NULL, NULL, &data, &size); + ok(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "hres = %x\n", hres); + + hkey = pSHGetShellKey(SHKEY_Root_HKLM, NULL, FALSE); + ok(hkey != NULL, "Can't create key\n"); + ok(SUCCEEDED(RegDeleteKeyW(hkey, WineTestW)), "Can't delte key\n"); + RegCloseKey(hkey); } static void init_pointers(void) @@ -2782,6 +2832,10 @@ static void init_pointers(void) MAKEFUNC(SHGetShellKey, 491); MAKEFUNC(SHPropertyBag_ReadLONG, 496); MAKEFUNC(IUnknown_ProfferService, 514); + MAKEFUNC(SKGetValueW, 516); + MAKEFUNC(SKSetValueW, 517); + MAKEFUNC(SKDeleteValueW, 518); + MAKEFUNC(SKAllocValueW, 519); #undef MAKEFUNC }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2010