wine-commits August 2008

wine-commits@winehq.org

2 participants
839 discussions

Maarten Lankhorst : winealsa.drv: Add ability to recover from underruns to directsound driver.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 2cd620802a3a7a1011a89c301270737ac1a1cfe5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cd620802a3a7a1011a89c301… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Aug 8 20:50:02 2008 +0200 winealsa.drv: Add ability to recover from underruns to directsound driver. Fixes handling of buffer underruns that might still occur. --- dlls/winealsa.drv/dsoutput.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/dsoutput.c b/dlls/winealsa.drv/dsoutput.c index 130e181..72fc0a7 100644 --- a/dlls/winealsa.drv/dsoutput.c +++ b/dlls/winealsa.drv/dsoutput.c @@ -548,7 +548,13 @@ static HRESULT WINAPI IDsDriverBufferImpl_GetPosition(PIDSDRIVERBUFFER iface, } if (state == SND_PCM_STATE_RUNNING) { - snd_pcm_uframes_t used = This->mmap_buflen_frames - snd_pcm_avail_update(This->pcm); + snd_pcm_sframes_t used = This->mmap_buflen_frames - snd_pcm_avail_update(This->pcm); + + if (used < 0) + { + snd_pcm_forward(This->pcm, -used); + used = 0; + } if (This->mmap_pos > used) hw_pptr = This->mmap_pos - used;

1 0

Dan Hipschman : advapi32/tests: Add tests for GetSecurityInfo with a NULL security descriptor pointer.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 80c6099b2c61314bae50405a925758ea2ae75e59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80c6099b2c61314bae50405a9… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Aug 7 15:14:06 2008 -0700 advapi32/tests: Add tests for GetSecurityInfo with a NULL security descriptor pointer. --- dlls/advapi32/tests/security.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 9eab933..fd3407f 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2511,6 +2511,18 @@ static void test_GetSecurityInfo(void) ok(IsValidAcl(dacl), "GetSecurityInfo\n"); LocalFree(sd); + + /* If we don't ask for the security descriptor, Windows will still give us + the other stuff, leaving us no way to free it. */ + ret = GetSecurityInfo(obj, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + &owner, &group, &dacl, NULL, NULL); + ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); + ok(owner != NULL, "GetSecurityInfo\n"); + ok(group != NULL, "GetSecurityInfo\n"); + ok(dacl != NULL, "GetSecurityInfo\n"); + ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + CloseHandle(obj); }

1 0

Dan Hipschman : advapi32: Implement GetSecurityInfo.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 62e5b6270ba3526bcbf4c3880ddd10be69fe2e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62e5b6270ba3526bcbf4c3880… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Aug 7 12:54:58 2008 -0700 advapi32: Implement GetSecurityInfo. --- dlls/advapi32/security.c | 62 ++++++++++++++++++++++++++++++++++++++- dlls/advapi32/tests/security.c | 32 ++++++++++++++++++++ 2 files changed, 92 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 95b7a7b..6a19ef0 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2710,6 +2710,22 @@ BOOL WINAPI PrivilegedServiceAuditAlarmW( LPCWSTR SubsystemName, LPCWSTR Service /****************************************************************************** * GetSecurityInfo [ADVAPI32.@] + * + * Retrieves a copy of the security descriptor associated with an object. + * + * PARAMS + * hObject [I] A handle for the object. + * ObjectType [I] The type of object. + * SecurityInfo [I] A bitmask indicating what info to retrieve. + * ppsidOwner [O] If non-null, receives a pointer to the owner SID. + * ppsidGroup [O] If non-null, receives a pointer to the group SID. + * ppDacl [O] If non-null, receives a pointer to the DACL. + * ppSacl [O] If non-null, receives a pointer to the SACL. + * ppSecurityDescriptor [O] Receives a pointer to the security descriptor, + * which must be freed with LocalFree. + * + * RETURNS + * ERROR_SUCCESS if all's well, and a WIN32 error code otherwise. */ DWORD WINAPI GetSecurityInfo( HANDLE hObject, SE_OBJECT_TYPE ObjectType, @@ -2718,8 +2734,50 @@ DWORD WINAPI GetSecurityInfo( PSECURITY_DESCRIPTOR *ppSecurityDescriptor ) { - FIXME("stub!\n"); - return ERROR_BAD_PROVIDER; + PSECURITY_DESCRIPTOR sd; + NTSTATUS status; + ULONG n1, n2; + BOOL present, defaulted; + + status = NtQuerySecurityObject(hObject, SecurityInfo, NULL, 0, &n1); + if (status != STATUS_BUFFER_TOO_SMALL && status != STATUS_SUCCESS) + return RtlNtStatusToDosError(status); + + sd = LocalAlloc(0, n1); + if (!sd) + return ERROR_NOT_ENOUGH_MEMORY; + + status = NtQuerySecurityObject(hObject, SecurityInfo, sd, n1, &n2); + if (status != STATUS_SUCCESS) + { + LocalFree(sd); + return RtlNtStatusToDosError(status); + } + + if (ppsidOwner) + { + *ppsidOwner = NULL; + GetSecurityDescriptorOwner(sd, ppsidOwner, &defaulted); + } + if (ppsidGroup) + { + *ppsidGroup = NULL; + GetSecurityDescriptorGroup(sd, ppsidGroup, &defaulted); + } + if (ppDacl) + { + *ppDacl = NULL; + GetSecurityDescriptorDacl(sd, &present, ppDacl, &defaulted); + } + if (ppSacl) + { + *ppSacl = NULL; + GetSecurityDescriptorSacl(sd, &present, ppSacl, &defaulted); + } + if (ppSecurityDescriptor) + *ppSecurityDescriptor = sd; + + return ERROR_SUCCESS; } /****************************************************************************** diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index ea4d912..9eab933 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -2483,6 +2483,37 @@ static void test_acls(void) ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "InitializeAcl(-1) failed with error %d\n", GetLastError()); } +static void test_GetSecurityInfo(void) +{ + HANDLE obj; + PSECURITY_DESCRIPTOR sd; + PSID owner, group; + PACL dacl; + DWORD ret; + + /* Create something. Files have lots of associated security info. */ + obj = CreateFile(myARGV[0], GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + if (!obj) + { + skip("Couldn't create an object for GetSecurityInfo test\n"); + return; + } + + ret = GetSecurityInfo(obj, SE_FILE_OBJECT, + OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, + &owner, &group, &dacl, NULL, &sd); + ok(ret == ERROR_SUCCESS, "GetSecurityInfo returned %d\n", ret); + ok(sd != NULL, "GetSecurityInfo\n"); + ok(owner != NULL, "GetSecurityInfo\n"); + ok(group != NULL, "GetSecurityInfo\n"); + ok(dacl != NULL, "GetSecurityInfo\n"); + ok(IsValidAcl(dacl), "GetSecurityInfo\n"); + + LocalFree(sd); + CloseHandle(obj); +} + START_TEST(security) { init(); @@ -2511,4 +2542,5 @@ START_TEST(security) test_ConvertSecurityDescriptorToString(); test_PrivateObjectSecurity(); test_acls(); + test_GetSecurityInfo(); }

1 0

Dan Hipschman : widl: Honor typedef pointer attributes.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 790e6dcd297717a7db160c68f3077c2a8a4c9718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=790e6dcd297717a7db160c68f… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Aug 7 10:33:46 2008 -0700 widl: Honor typedef pointer attributes. --- tools/widl/parser.y | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index f1a95d4..f6daa0e 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1426,7 +1426,6 @@ static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl, { expr_list_t *sizes = get_attrp(v->attrs, ATTR_SIZEIS); expr_list_t *lengs = get_attrp(v->attrs, ATTR_LENGTHIS); - int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE); int sizeless, has_varconf; expr_t *dim; type_t *atype, **ptype; @@ -1457,13 +1456,15 @@ static void set_type(var_t *v, decl_spec_t *decl_spec, const declarator_t *decl, * pointer_default so we need to fix that up here */ if (!arr) { + int ptr_attr = get_attrv(v->attrs, ATTR_POINTERTYPE); const type_t *ptr = NULL; /* pointer attributes on the left side of the type belong to the function * pointer, if one is being declared */ type_t **pt = func_type ? &func_type : &v->type; - for (ptr = *pt; ptr; ) + for (ptr = *pt; ptr && !ptr_attr; ) { - if (ptr->kind == TKIND_ALIAS) + ptr_attr = get_attrv(ptr->attrs, ATTR_POINTERTYPE); + if (!ptr_attr && ptr->kind == TKIND_ALIAS) ptr = ptr->orig; else break;

1 0

Ken Thomases : kernel32: Strip modifiers from the Mac locale so setlocale can parse it.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 59bf036c80470a55ea742ff7fcc376abc02adfb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=59bf036c80470a55ea742ff7f… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Aug 7 19:00:00 2008 -0500 kernel32: Strip modifiers from the Mac locale so setlocale can parse it. The CFLocale API can produce locale identifiers with modifiers, such as "pl_PL@currency=EUR". However, the Mac setlocale() can't understand such locale strings. --- dlls/kernel32/locale.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 5fdb307..0366894 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -2867,12 +2867,15 @@ void LOCALE_Init(void) CFArrayRef preferred_locales, all_locales; CFStringRef user_language_string_ref = NULL; char user_locale[50]; + char* p; CFLocaleRef user_locale_ref = CFLocaleCopyCurrent(); CFStringRef user_locale_string_ref = CFLocaleGetIdentifier( user_locale_ref ); CFStringGetCString( user_locale_string_ref, user_locale, sizeof(user_locale), kCFStringEncodingUTF8 ); CFRelease( user_locale_ref ); + /* Strip modifiers because setlocale() can't parse them. */ + if (p = strchr( user_locale, '@' )) *p = 0; if (!strchr( user_locale, '.' )) strcat( user_locale, ".UTF-8" ); unix_cp = CP_UTF8; /* default to utf-8 even if we don't get a valid locale */ setenv( "LANG", user_locale, 0 );

1 0

Dylan Smith : richedit: Fixed rtf reader bug that caused large start indents.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 6a65f3b38ec1e1fd2122ac99d46aab90de82d17d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a65f3b38ec1e1fd2122ac99d… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Aug 6 17:10:49 2008 -0400 richedit: Fixed rtf reader bug that caused large start indents. The problem was that the paragraph format was being retrieved, slightly modified and then used to set the paragraph format, without limiting the mask to what was being set. The PFM_OFFSETINDENT mask flag being valid meant that dxStartIndent specifies a relative offset, thus dxStartIndent was doubled. --- dlls/riched20/editor.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b5d1df5..381443b 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -472,14 +472,14 @@ static void ME_RTFParAttrHook(RTF_Info *info) } case rtfFirstIndent: ME_GetSelectionParaFormat(info->editor, &fmt); - fmt.dwMask |= PFM_STARTINDENT | PFM_OFFSET; + fmt.dwMask = PFM_STARTINDENT | PFM_OFFSET; fmt.dxStartIndent += info->rtfParam; fmt.dxOffset = -info->rtfParam; break; case rtfLeftIndent: /* we assume rtfLeftIndent is always specified before rtfFirstIndent */ ME_GetSelectionParaFormat(info->editor, &fmt); - fmt.dwMask |= PFM_STARTINDENT; + fmt.dwMask = PFM_STARTINDENT; fmt.dxStartIndent = info->rtfParam; fmt.dxOffset = 0; break; @@ -504,11 +504,11 @@ static void ME_RTFParAttrHook(RTF_Info *info) ME_GetSelectionParaFormat(info->editor, &fmt); if (!(fmt.dwMask & PFM_TABSTOPS)) { - fmt.dwMask |= PFM_TABSTOPS; fmt.cTabCount = 0; } if (fmt.cTabCount < MAX_TAB_STOPS && info->rtfParam < 0x1000000) fmt.rgxTabs[fmt.cTabCount++] = info->rtfParam; + fmt.dwMask = PFM_TABSTOPS; break; case rtfKeep: fmt.dwMask = PFM_KEEP; @@ -571,85 +571,92 @@ static void ME_RTFParAttrHook(RTF_Info *info) ME_GetSelectionParaFormat(info->editor, &fmt); if (!(fmt.dwMask & PFM_BORDER)) { - fmt.dwMask |= PFM_BORDER; fmt.wBorderSpace = 0; fmt.wBorderWidth = 1; fmt.wBorders = 0; } fmt.wBorders |= 1; + fmt.dwMask = PFM_BORDER; break; case rtfBorderRight: ME_GetSelectionParaFormat(info->editor, &fmt); if (!(fmt.dwMask & PFM_BORDER)) { - fmt.dwMask |= PFM_BORDER; fmt.wBorderSpace = 0; fmt.wBorderWidth = 1; fmt.wBorders = 0; } fmt.wBorders |= 2; + fmt.dwMask = PFM_BORDER; break; case rtfBorderTop: ME_GetSelectionParaFormat(info->editor, &fmt); if (!(fmt.dwMask & PFM_BORDER)) { - fmt.dwMask |= PFM_BORDER; fmt.wBorderSpace = 0; fmt.wBorderWidth = 1; fmt.wBorders = 0; } fmt.wBorders |= 4; + fmt.dwMask = PFM_BORDER; break; case rtfBorderBottom: ME_GetSelectionParaFormat(info->editor, &fmt); if (!(fmt.dwMask & PFM_BORDER)) { - fmt.dwMask |= PFM_BORDER; fmt.wBorderSpace = 0; fmt.wBorderWidth = 1; fmt.wBorders = 0; } fmt.wBorders |= 8; + fmt.dwMask = PFM_BORDER; break; case rtfBorderSingle: ME_GetSelectionParaFormat(info->editor, &fmt); /* we assume that borders have been created before (RTF spec) */ fmt.wBorders &= ~0x700; fmt.wBorders |= 1 << 8; + fmt.dwMask = PFM_BORDER; break; case rtfBorderThick: ME_GetSelectionParaFormat(info->editor, &fmt); /* we assume that borders have been created before (RTF spec) */ fmt.wBorders &= ~0x700; fmt.wBorders |= 2 << 8; + fmt.dwMask = PFM_BORDER; break; case rtfBorderShadow: ME_GetSelectionParaFormat(info->editor, &fmt); /* we assume that borders have been created before (RTF spec) */ fmt.wBorders &= ~0x700; fmt.wBorders |= 10 << 8; + fmt.dwMask = PFM_BORDER; break; case rtfBorderDouble: ME_GetSelectionParaFormat(info->editor, &fmt); /* we assume that borders have been created before (RTF spec) */ fmt.wBorders &= ~0x700; fmt.wBorders |= 7 << 8; + fmt.dwMask = PFM_BORDER; break; case rtfBorderDot: ME_GetSelectionParaFormat(info->editor, &fmt); /* we assume that borders have been created before (RTF spec) */ fmt.wBorders &= ~0x700; fmt.wBorders |= 11 << 8; + fmt.dwMask = PFM_BORDER; break; case rtfBorderWidth: ME_GetSelectionParaFormat(info->editor, &fmt); /* we assume that borders have been created before (RTF spec) */ fmt.wBorderWidth |= ((info->rtfParam / 15) & 7) << 8; + fmt.dwMask = PFM_BORDER; break; case rtfBorderSpace: ME_GetSelectionParaFormat(info->editor, &fmt); /* we assume that borders have been created before (RTF spec) */ fmt.wBorderSpace = info->rtfParam; + fmt.dwMask = PFM_BORDER; break; } if (fmt.dwMask) {

1 0

Eric Pouech : winedbg: Don' t force integral values while displaying a stack value, it doesn' t work for float/double values.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: 687a00c0afbce7e17ccffded2a013fe0d01fc787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=687a00c0afbce7e17ccffded2… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Wed Aug 6 21:56:24 2008 +0200 winedbg: Don't force integral values while displaying a stack value, it doesn't work for float/double values. --- programs/winedbg/symbol.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c index cd69a9c..b4b04e6 100644 --- a/programs/winedbg/symbol.c +++ b/programs/winedbg/symbol.c @@ -597,7 +597,7 @@ void symbol_print_local(const SYMBOL_INFO* sym, ULONG base, if (fill_sym_lvalue(sym, base, &lvalue, buffer, sizeof(buffer))) { - print_value(&lvalue, 'x', 1); + print_value(&lvalue, 0, 1); if (detailed) dbg_printf(" (%s%s)", (sym->Flags & SYMFLAG_PARAMETER) ? "parameter" : "local",

1 0

Huw Davies : kernel32: GetCalendarInfo shouldn't return HRESULT codes. Change a MESSAGE to a FIXME.
by Alexandre Julliard 18 Aug '08

18 Aug '08

Module: wine Branch: master Commit: d5f6d841c1f16b31db53e2404c6ca8040ea4a195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5f6d841c1f16b31db53e2404… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 6 12:31:55 2008 +0100 kernel32: GetCalendarInfo shouldn't return HRESULT codes. Change a MESSAGE to a FIXME. --- dlls/kernel32/time.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index 9f33af6..29b3dc8 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -651,16 +651,16 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, switch (CalType & ~(CAL_NOUSEROVERRIDE|CAL_RETURN_NUMBER|CAL_USE_CP_ACP)) { case CAL_ICALINTVALUE: FIXME("Unimplemented caltype %d\n", CalType & 0xffff); - return E_FAIL; + return 0; case CAL_SCALNAME: FIXME("Unimplemented caltype %d\n", CalType & 0xffff); - return E_FAIL; + return 0; case CAL_IYEAROFFSETRANGE: FIXME("Unimplemented caltype %d\n", CalType & 0xffff); - return E_FAIL; + return 0; case CAL_SERASTRING: FIXME("Unimplemented caltype %d\n", CalType & 0xffff); - return E_FAIL; + return 0; case CAL_SSHORTDATE: return GetLocaleInfoW(Locale, LOCALE_SSHORTDATE, lpCalData, cchData); case CAL_SLONGDATE: @@ -750,8 +750,10 @@ int WINAPI GetCalendarInfoW(LCID Locale, CALID Calendar, CALTYPE CalType, case CAL_ITWODIGITYEARMAX: if (lpValue) *lpValue = CALINFO_MAX_YEAR; break; - default: MESSAGE("Unknown caltype %d\n",CalType & 0xffff); - return E_FAIL; + default: + FIXME("Unknown caltype %d\n",CalType & 0xffff); + SetLastError(ERROR_INVALID_FLAGS); + return 0; } return 0; }

1 0

Jeremy Newman : add a language sidebar
by Jeremy Newman 05 Aug '08

05 Aug '08

Module: website Branch: master Commit: 37cc50e29c23ec0b01c006a4ea9b7819c1388962 URL: http://source.winehq.org/git/website.git/?a=commit;h=37cc50e29c23ec0b01c006… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Aug 5 11:44:07 2008 -0500 add a language sidebar --- images/lang/de.png | Bin 0 -> 389 bytes images/lang/en.png | Bin 0 -> 576 bytes images/lang/es.png | Bin 0 -> 1305 bytes images/lang/fi.png | Bin 0 -> 414 bytes images/lang/fr.png | Bin 0 -> 442 bytes images/lang/he.png | Bin 0 -> 414 bytes images/lang/hi.png | Bin 0 -> 622 bytes images/lang/hu.png | Bin 0 -> 987 bytes images/lang/it.png | Bin 0 -> 434 bytes images/lang/ja.png | Bin 0 -> 412 bytes images/lang/nl.png | Bin 0 -> 394 bytes images/lang/pl.png | Bin 0 -> 353 bytes images/lang/pt-br.png | Bin 0 -> 720 bytes images/lang/pt.png | Bin 0 -> 484 bytes images/lang/ru.png | Bin 0 -> 399 bytes images/lang/sv.png | Bin 0 -> 483 bytes images/lang/tr.png | Bin 0 -> 395 bytes images/lang/zh.png | Bin 0 -> 494 bytes include/themes/winehq/menu_lang_row.template | 12 ++++++++++++ templates/en/menu.xml | 5 +++++ templates/es/menu.xml | 5 +++++ 21 files changed, 22 insertions(+), 0 deletions(-) diff --git a/images/lang/de.png b/images/lang/de.png new file mode 100644 index 0000000..d087ae4 Binary files /dev/null and b/images/lang/de.png differ diff --git a/images/lang/en.png b/images/lang/en.png new file mode 100644 index 0000000..0c4f4fe Binary files /dev/null and b/images/lang/en.png differ diff --git a/images/lang/es.png b/images/lang/es.png new file mode 100644 index 0000000..47431fe Binary files /dev/null and b/images/lang/es.png differ diff --git a/images/lang/fi.png b/images/lang/fi.png new file mode 100644 index 0000000..9f333f1 Binary files /dev/null and b/images/lang/fi.png differ diff --git a/images/lang/fr.png b/images/lang/fr.png new file mode 100644 index 0000000..4f52a06 Binary files /dev/null and b/images/lang/fr.png differ diff --git a/images/lang/he.png b/images/lang/he.png new file mode 100644 index 0000000..3865797 Binary files /dev/null and b/images/lang/he.png differ diff --git a/images/lang/hi.png b/images/lang/hi.png new file mode 100644 index 0000000..7fb5bf5 Binary files /dev/null and b/images/lang/hi.png differ diff --git a/images/lang/hu.png b/images/lang/hu.png new file mode 100644 index 0000000..6e77ba4 Binary files /dev/null and b/images/lang/hu.png differ diff --git a/images/lang/it.png b/images/lang/it.png new file mode 100644 index 0000000..0767830 Binary files /dev/null and b/images/lang/it.png differ diff --git a/images/lang/ja.png b/images/lang/ja.png new file mode 100644 index 0000000..4a09b1f Binary files /dev/null and b/images/lang/ja.png differ diff --git a/images/lang/nl.png b/images/lang/nl.png new file mode 100644 index 0000000..a9440bb Binary files /dev/null and b/images/lang/nl.png differ diff --git a/images/lang/pl.png b/images/lang/pl.png new file mode 100644 index 0000000..a8f7609 Binary files /dev/null and b/images/lang/pl.png differ diff --git a/images/lang/pt-br.png b/images/lang/pt-br.png new file mode 100644 index 0000000..86e03e4 Binary files /dev/null and b/images/lang/pt-br.png differ diff --git a/images/lang/pt.png b/images/lang/pt.png new file mode 100644 index 0000000..62a0eba Binary files /dev/null and b/images/lang/pt.png differ diff --git a/images/lang/ru.png b/images/lang/ru.png new file mode 100644 index 0000000..c20c449 Binary files /dev/null and b/images/lang/ru.png differ diff --git a/images/lang/sv.png b/images/lang/sv.png new file mode 100644 index 0000000..648ac61 Binary files /dev/null and b/images/lang/sv.png differ diff --git a/images/lang/tr.png b/images/lang/tr.png new file mode 100644 index 0000000..7f78413 Binary files /dev/null and b/images/lang/tr.png differ diff --git a/images/lang/zh.png b/images/lang/zh.png new file mode 100644 index 0000000..e0bce88 Binary files /dev/null and b/images/lang/zh.png differ diff --git a/include/themes/winehq/menu_lang_row.template b/include/themes/winehq/menu_lang_row.template new file mode 100644 index 0000000..87738bd --- /dev/null +++ b/include/themes/winehq/menu_lang_row.template @@ -0,0 +1,12 @@ +<tr> +<td> + <table width="145" class="sideBorder" style="padding-bottom: 1px; padding-top: 1px;"> + <tr><td> + <span class="menuItem"><a href="{$url}" title="{$name}" + class="menuItem"><img src="{$root}/images/lang/{$item}.png" + alt="{$name}" /> {$name}</a></span> + </td></tr> + </table> +</td> +<td><img src="{$root}/images/blank.gif" width="5" height="1" alt=""></td> +</tr> diff --git a/templates/en/menu.xml b/templates/en/menu.xml index 21c7504..8ac450c 100644 --- a/templates/en/menu.xml +++ b/templates/en/menu.xml @@ -46,6 +46,11 @@ <sect name="wineconf" desc="WineConf" link="{$root}/site/wineconf" /> <sect name="spacer" template="spacer"/> </sect> + <sect name="search" desc="Languages" unfold="1" template="top"> + <sect name="en" desc="English" template="lang" link="{$root}/site/?lang=en" /> + <sect name="es" desc="Español" template="lang" link="{$root}/site/?lang=es" /> + <sect name="spacer" template="spacer"/> + </sect> <sect name="search" desc="Search WineHQ" unfold="1" template="top"> <sect name="search" desc="Enter Search!" template="search" /> <sect name="spacer" template="spacer"/> diff --git a/templates/es/menu.xml b/templates/es/menu.xml index 21c7504..8ac450c 100644 --- a/templates/es/menu.xml +++ b/templates/es/menu.xml @@ -46,6 +46,11 @@ <sect name="wineconf" desc="WineConf" link="{$root}/site/wineconf" /> <sect name="spacer" template="spacer"/> </sect> + <sect name="search" desc="Languages" unfold="1" template="top"> + <sect name="en" desc="English" template="lang" link="{$root}/site/?lang=en" /> + <sect name="es" desc="Español" template="lang" link="{$root}/site/?lang=es" /> + <sect name="spacer" template="spacer"/> + </sect> <sect name="search" desc="Search WineHQ" unfold="1" template="top"> <sect name="search" desc="Enter Search!" template="search" /> <sect name="spacer" template="spacer"/>

1 0

Jeremy Newman : pass along the short name of the link to be used in the template
by Jeremy Newman 05 Aug '08

05 Aug '08

Module: website Branch: master Commit: 5bf3eecdb1cde3eacf15964a1b049321b310696f URL: http://source.winehq.org/git/website.git/?a=commit;h=5bf3eecdb1cde3eacf1596… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Aug 5 11:43:15 2008 -0500 pass along the short name of the link to be used in the template --- include/menu.php | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/menu.php b/include/menu.php index edb58c9..c014810 100644 --- a/include/menu.php +++ b/include/menu.php @@ -105,7 +105,7 @@ class menu { // add item with template $template = isset($nav['template']) ? $nav['template'] : 'item'; - $this->add($template, $nav['desc'], $link, $level, $sel); + $this->add($template, $nav['name'], $nav['desc'], $link, $level, $sel); // go into this item and get subitems if selected if ($sel or $nav['unfold']) @@ -157,7 +157,7 @@ class menu } // add a menu link - function add ($template, $name, $url = null, $level = 0, $selected = 0) + function add ($template, $item, $name, $url = null, $level = 0, $selected = 0) { // bold select items if ($selected) @@ -169,6 +169,7 @@ class menu // vars for template $vars = array( 'pad' => "$pad", + 'item' => "$item", 'name' => "$name", 'url' => "$url", );

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
84
Older →

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 August 2008