August 2015 - Wine-Commits - list.winehq.org

Eric Kohl : advapi32: Add some well-known SDDL SID strings.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 424f010ac194742db220694c48cb709b0514a87a URL: http://source.winehq.org/git/wine.git/?a=commit;h=424f010ac194742db220694c4… Author: Eric Kohl <eric.kohl(a)t-online.de> Date: Tue Aug 18 22:32:00 2015 +0200 advapi32: Add some well-known SDDL SID strings. --- dlls/advapi32/security.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index b632577..d1e2bb4 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -147,16 +147,16 @@ static const WELLKNOWNRID WellKnownRids[] = { { {'L','A'}, WinAccountAdministratorSid, DOMAIN_USER_RID_ADMIN }, { {'L','G'}, WinAccountGuestSid, DOMAIN_USER_RID_GUEST }, { {0,0}, WinAccountKrbtgtSid, DOMAIN_USER_RID_KRBTGT }, - { {0,0}, WinAccountDomainAdminsSid, DOMAIN_GROUP_RID_ADMINS }, - { {0,0}, WinAccountDomainUsersSid, DOMAIN_GROUP_RID_USERS }, - { {0,0}, WinAccountDomainGuestsSid, DOMAIN_GROUP_RID_GUESTS }, - { {0,0}, WinAccountComputersSid, DOMAIN_GROUP_RID_COMPUTERS }, - { {0,0}, WinAccountControllersSid, DOMAIN_GROUP_RID_CONTROLLERS }, - { {0,0}, WinAccountCertAdminsSid, DOMAIN_GROUP_RID_CERT_ADMINS }, - { {0,0}, WinAccountSchemaAdminsSid, DOMAIN_GROUP_RID_SCHEMA_ADMINS }, - { {0,0}, WinAccountEnterpriseAdminsSid, DOMAIN_GROUP_RID_ENTERPRISE_ADMINS }, - { {0,0}, WinAccountPolicyAdminsSid, DOMAIN_GROUP_RID_POLICY_ADMINS }, - { {0,0}, WinAccountRasAndIasServersSid, DOMAIN_ALIAS_RID_RAS_SERVERS }, + { {'D','A'}, WinAccountDomainAdminsSid, DOMAIN_GROUP_RID_ADMINS }, + { {'D','U'}, WinAccountDomainUsersSid, DOMAIN_GROUP_RID_USERS }, + { {'D','G'}, WinAccountDomainGuestsSid, DOMAIN_GROUP_RID_GUESTS }, + { {'D','C'}, WinAccountComputersSid, DOMAIN_GROUP_RID_COMPUTERS }, + { {'D','D'}, WinAccountControllersSid, DOMAIN_GROUP_RID_CONTROLLERS }, + { {'C','A'}, WinAccountCertAdminsSid, DOMAIN_GROUP_RID_CERT_ADMINS }, + { {'S','A'}, WinAccountSchemaAdminsSid, DOMAIN_GROUP_RID_SCHEMA_ADMINS }, + { {'E','A'}, WinAccountEnterpriseAdminsSid, DOMAIN_GROUP_RID_ENTERPRISE_ADMINS }, + { {'P','A'}, WinAccountPolicyAdminsSid, DOMAIN_GROUP_RID_POLICY_ADMINS }, + { {'R','S'}, WinAccountRasAndIasServersSid, DOMAIN_ALIAS_RID_RAS_SERVERS }, };

1 0

Nikolay Sivov : dwrite: Extract and resolve font weight from name string.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 6b98b9ac700c133e7783e81257aa23a133c7d527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b98b9ac700c133e7783e8125… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 18 23:49:24 2015 +0300 dwrite: Extract and resolve font weight from name string. --- dlls/dwrite/font.c | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 156 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index ec230c8..7e88a2f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -42,6 +42,12 @@ static const FLOAT RECOMMENDED_OUTLINE_AA_THRESHOLD = 100.0f; static const FLOAT RECOMMENDED_OUTLINE_A_THRESHOLD = 350.0f; static const FLOAT RECOMMENDED_NATURAL_PPEM = 20.0f; +/* common modifiers used in names */ +static const WCHAR extraW[] = {'e','x','t','r','a',0}; +static const WCHAR ultraW[] = {'u','l','t','r','a',0}; +static const WCHAR semiW[] = {'s','e','m','i',0}; +static const WCHAR extW[] = {'e','x','t',0}; + struct dwrite_font_propvec { FLOAT stretch; FLOAT style; @@ -2113,12 +2119,7 @@ static DWRITE_FONT_STRETCH font_extract_stretch(struct list *tokens, DWRITE_FONT static const WCHAR compactW[] = {'c','o','m','p','a','c','t',0}; static const WCHAR narrowW[] = {'n','a','r','r','o','w',0}; static const WCHAR wideW[] = {'w','i','d','e',0}; - /* modifiers */ - static const WCHAR extraW[] = {'e','x','t','r','a',0}; - static const WCHAR ultraW[] = {'u','l','t','r','a',0}; static const WCHAR condW[] = {'c','o','n','d',0}; - static const WCHAR extW[] = {'e','x','t',0}; - static const WCHAR semiW[] = {'s','e','m','i',0}; static const struct name_pattern ultracondensed_patterns[] = { { extraW, compressedW }, @@ -2206,6 +2207,135 @@ static DWRITE_FONT_STRETCH font_extract_stretch(struct list *tokens, DWRITE_FONT return stretch; } +static DWRITE_FONT_WEIGHT font_extract_weight(struct list *tokens, DWRITE_FONT_WEIGHT weight) +{ + static const WCHAR mediumW[] = {'m','e','d','i','u','m',0}; + static const WCHAR blackW[] = {'b','l','a','c','k',0}; + static const WCHAR heavyW[] = {'h','e','a','v','y',0}; + static const WCHAR lightW[] = {'l','i','g','h','t',0}; + static const WCHAR boldW[] = {'b','o','l','d',0}; + static const WCHAR demiW[] = {'d','e','m','i',0}; + static const WCHAR thinW[] = {'t','h','i','n',0}; + static const WCHAR nordW[] = {'n','o','r','d',0}; + + static const struct name_pattern thin_patterns[] = { + { extraW, thinW }, + { extW, thinW }, + { ultraW, thinW }, + { NULL } + }; + + static const struct name_pattern extralight_patterns[] = { + { extraW, lightW }, + { extW, lightW }, + { ultraW, lightW }, + { NULL } + }; + + static const struct name_pattern demibold_patterns[] = { + { semiW, boldW }, + { demiW, boldW }, + { NULL } + }; + + static const struct name_pattern extrabold_patterns[] = { + { extraW, boldW }, + { extW, boldW }, + { ultraW, boldW }, + { NULL } + }; + + static const struct name_pattern extrablack_patterns[] = { + { extraW, blackW }, + { extW, blackW }, + { ultraW, blackW }, + { NULL } + }; + + static const struct name_pattern bold_patterns[] = { + { boldW }, + { NULL } + }; + + static const struct name_pattern thin2_patterns[] = { + { thinW }, + { NULL } + }; + + static const struct name_pattern light_patterns[] = { + { lightW }, + { NULL } + }; + + static const struct name_pattern medium_patterns[] = { + { mediumW }, + { NULL } + }; + + static const struct name_pattern black_patterns[] = { + { blackW }, + { heavyW }, + { nordW }, + { NULL } + }; + + static const struct name_pattern demibold2_patterns[] = { + { demiW }, + { NULL } + }; + + static const struct name_pattern extrabold2_patterns[] = { + { ultraW }, + { NULL } + }; + + /* FIXME: allow optional 'face' suffix, separated or not. It's removed together with + matching pattern. */ + + if (match_pattern_list(tokens, thin_patterns)) + return DWRITE_FONT_WEIGHT_THIN; + + if (match_pattern_list(tokens, extralight_patterns)) + return DWRITE_FONT_WEIGHT_EXTRA_LIGHT; + + if (match_pattern_list(tokens, demibold_patterns)) + return DWRITE_FONT_WEIGHT_DEMI_BOLD; + + if (match_pattern_list(tokens, extrabold_patterns)) + return DWRITE_FONT_WEIGHT_EXTRA_BOLD; + + if (match_pattern_list(tokens, extrablack_patterns)) + return DWRITE_FONT_WEIGHT_EXTRA_BLACK; + + if (match_pattern_list(tokens, bold_patterns)) + return DWRITE_FONT_WEIGHT_BOLD; + + if (match_pattern_list(tokens, thin2_patterns)) + return DWRITE_FONT_WEIGHT_THIN; + + if (match_pattern_list(tokens, light_patterns)) + return DWRITE_FONT_WEIGHT_LIGHT; + + if (match_pattern_list(tokens, medium_patterns)) + return DWRITE_FONT_WEIGHT_MEDIUM; + + if (match_pattern_list(tokens, black_patterns)) + return DWRITE_FONT_WEIGHT_BLACK; + + if (match_pattern_list(tokens, black_patterns)) + return DWRITE_FONT_WEIGHT_BLACK; + + if (match_pattern_list(tokens, demibold2_patterns)) + return DWRITE_FONT_WEIGHT_DEMI_BOLD; + + if (match_pattern_list(tokens, extrabold2_patterns)) + return DWRITE_FONT_WEIGHT_EXTRA_BOLD; + + /* FIXME: use abbreviated names to extract weight */ + + return weight; +} + static void font_apply_differentiation_rules(struct dwrite_font_data *font, WCHAR *familyW, WCHAR *faceW) { static const WCHAR bookW[] = {'B','o','o','k',0}; @@ -2223,10 +2353,11 @@ static void font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA NULL }; - DWRITE_FONT_STRETCH stretch = font->stretch; static const WCHAR spaceW[] = {' ',0}; WCHAR familynameW[255], facenameW[255]; struct name_token *token, *token2; + DWRITE_FONT_STRETCH stretch; + DWRITE_FONT_WEIGHT weight; BOOL found = FALSE; struct list tokens; const WCHAR *ptr; @@ -2290,9 +2421,23 @@ static void font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA /* extract stretch */ stretch = font_extract_stretch(&tokens, font->stretch); - /* TODO: extract weight */ - - /* TODO: resolve weight */ + /* extract weight */ + weight = font_extract_weight(&tokens, font->weight); + + /* resolve weight */ + if (weight != font->weight) { + if (!(weight < DWRITE_FONT_WEIGHT_NORMAL && font->weight < DWRITE_FONT_WEIGHT_NORMAL) && + !(weight > DWRITE_FONT_WEIGHT_MEDIUM && font->weight > DWRITE_FONT_WEIGHT_MEDIUM) && + !((weight == DWRITE_FONT_WEIGHT_NORMAL && font->weight == DWRITE_FONT_WEIGHT_MEDIUM) || + (weight == DWRITE_FONT_WEIGHT_MEDIUM && font->weight == DWRITE_FONT_WEIGHT_NORMAL)) && + !(abs(weight - font->weight) <= 150 && + font->weight != DWRITE_FONT_WEIGHT_NORMAL && + font->weight != DWRITE_FONT_WEIGHT_MEDIUM && + font->weight != DWRITE_FONT_WEIGHT_BOLD)) { + + font->weight = weight; + } + } /* Resolve stretch - extracted stretch can't be normal, it will override specified stretch if it's leaning in opposite direction from normal comparing to specified stretch or if specified @@ -2306,6 +2451,8 @@ static void font_apply_differentiation_rules(struct dwrite_font_data *font, WCHA } } + /* FIXME: cleanup face name from possible 2-3 digit prefixes, compose final family/face names */ + /* release tokens */ LIST_FOR_EACH_ENTRY_SAFE(token, token2, &tokens, struct name_token, entry) { list_remove(&token->entry);

1 0

Nikolay Sivov : dwrite: Protect from space-only strings when trimming away spaces.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 1f54400bbf35de4f892468b78544951c3dc8f968 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f54400bbf35de4f892468b78… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Aug 18 23:49:50 2015 +0300 dwrite: Protect from space-only strings when trimming away spaces. --- dlls/dwrite/font.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 7e88a2f..a0596ea 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1967,7 +1967,10 @@ static int trim_spaces(WCHAR *in, WCHAR *ret) while (isspaceW(*in)) in++; - len = strlenW(in); + ret[0] = 0; + if (!(len = strlenW(in))) + return 0; + while (isspaceW(in[len-1])) len--;

1 0

Vincent Povirk : comdlg32: Implement SetControlItemState for combo boxes.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 8d8e75849f9f342d3c48cbac6709a7ffc2d36d15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d8e75849f9f342d3c48cbac6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Aug 18 15:13:45 2015 -0500 comdlg32: Implement SetControlItemState for combo boxes. --- dlls/comdlg32/itemdlg.c | 59 +++++++++++++++++++++++++++++++++---------- dlls/comdlg32/tests/itemdlg.c | 2 -- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 72f32e1..1ed317a 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -3675,9 +3675,11 @@ static HRESULT WINAPI IFileDialogCustomize_fnAddControlItem(IFileDialogCustomize case IDLG_CCTRL_COMBOBOX: { UINT index; + cctrl_item* item; - if(get_combobox_index_from_id(ctrl->hwnd, dwIDItem) != -1) - return E_INVALIDARG; + hr = add_item(ctrl, dwIDItem, pszLabel, &item); + + if (FAILED(hr)) return hr; index = SendMessageW(ctrl->hwnd, CB_ADDSTRING, 0, (LPARAM)pszLabel); SendMessageW(ctrl->hwnd, CB_SETITEMDATA, index, dwIDItem); @@ -3719,19 +3721,21 @@ static HRESULT WINAPI IFileDialogCustomize_fnRemoveControlItem(IFileDialogCustom { case IDLG_CCTRL_COMBOBOX: { - UINT i, count = SendMessageW(ctrl->hwnd, CB_GETCOUNT, 0, 0); - if(!count || (count == CB_ERR)) - return E_FAIL; + cctrl_item* item; + DWORD position; - for(i = 0; i < count; i++) - if(SendMessageW(ctrl->hwnd, CB_GETITEMDATA, i, 0) == dwIDItem) - { - if(SendMessageW(ctrl->hwnd, CB_DELETESTRING, i, 0) == CB_ERR) - return E_FAIL; - return S_OK; - } + item = get_item(ctrl, dwIDItem, CDCS_VISIBLE|CDCS_ENABLED, &position); - return E_UNEXPECTED; + if ((item->cdcstate & (CDCS_VISIBLE|CDCS_ENABLED)) == (CDCS_VISIBLE|CDCS_ENABLED)) + { + if(SendMessageW(ctrl->hwnd, CB_DELETESTRING, position, 0) == CB_ERR) + return E_FAIL; + } + + list_remove(&item->entry); + item_free(item); + + return S_OK; } case IDLG_CCTRL_MENU: { @@ -3788,6 +3792,7 @@ static HRESULT WINAPI IFileDialogCustomize_fnGetControlItemState(IFileDialogCust switch(ctrl->type) { + case IDLG_CCTRL_COMBOBOX: case IDLG_CCTRL_MENU: { cctrl_item* item; @@ -3821,6 +3826,34 @@ static HRESULT WINAPI IFileDialogCustomize_fnSetControlItemState(IFileDialogCust switch(ctrl->type) { + case IDLG_CCTRL_COMBOBOX: + { + cctrl_item* item; + BOOL visible, was_visible; + DWORD position; + + item = get_item(ctrl, dwIDItem, CDCS_VISIBLE|CDCS_ENABLED, &position); + + if (!item) + return E_UNEXPECTED; + + visible = ((dwState & (CDCS_VISIBLE|CDCS_ENABLED)) == (CDCS_VISIBLE|CDCS_ENABLED)); + was_visible = ((item->cdcstate & (CDCS_VISIBLE|CDCS_ENABLED)) == (CDCS_VISIBLE|CDCS_ENABLED)); + + if (visible && !was_visible) + { + SendMessageW(ctrl->hwnd, CB_INSERTSTRING, position, (LPARAM)item->label); + SendMessageW(ctrl->hwnd, CB_SETITEMDATA, position, dwIDItem); + } + else if (!visible && was_visible) + { + SendMessageW(ctrl->hwnd, CB_DELETESTRING, position, 0); + } + + item->cdcstate = dwState; + + return S_OK; + } case IDLG_CCTRL_MENU: { TBBUTTON tbb; diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 2a604ec..1897178 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1970,7 +1970,6 @@ static void test_customize(void) ok(hr == E_FAIL, "got 0x%08x.\n", hr); ok(selected == -1, "got %d.\n", selected); - todo_wine { cdstate = 0xdeadbeef; hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); ok(hr == S_OK, "got 0x%08x.\n", hr); @@ -1987,7 +1986,6 @@ static void test_customize(void) hr = IFileDialogCustomize_GetControlItemState(pfdc, i, 0, &cdstate); ok(hr == S_OK, "got 0x%08x.\n", hr); ok(cdstate == CDCS_ENABLEDVISIBLE, "got 0x%08x.\n", cdstate); - } for(j = 0; j < 10; j++) {

1 0

Thomas Faller : cmd: Implement 'echo/'.
by Alexandre Julliard Aug. 19, 2015

Aug. 19, 2015

Module: wine Branch: master Commit: 1d09a3587814b6d6e424641a6274d7877f48cd67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d09a3587814b6d6e424641a6… Author: Thomas Faller <tfaller1(a)gmx.de> Date: Tue Aug 18 15:54:43 2015 +0200 cmd: Implement 'echo/'. --- programs/cmd/builtins.c | 4 ++-- programs/cmd/tests/test_builtins.cmd | 8 ++++++++ programs/cmd/tests/test_builtins.cmd.exp | 16 ++++++++++++++++ programs/cmd/wcmdmain.c | 7 +++++-- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index b124876..5661c69 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1465,7 +1465,7 @@ void WCMD_echo (const WCHAR *args) WCHAR *trimmed; if ( args[0]==' ' || args[0]=='\t' || args[0]=='.' - || args[0]==':' || args[0]==';') + || args[0]==':' || args[0]==';' || args[0]=='/') args++; trimmed = WCMD_strtrim(args); @@ -1473,7 +1473,7 @@ void WCMD_echo (const WCHAR *args) count = strlenW(trimmed); if (count == 0 && origcommand[0]!='.' && origcommand[0]!=':' - && origcommand[0]!=';') { + && origcommand[0]!=';' && origcommand[0]!='/') { if (echo_mode) WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), onW); else WCMD_output (WCMD_LoadMessage(WCMD_ECHOPROMPT), offW); heap_free(trimmed); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 5351e9c..0a8a4f4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -15,6 +15,10 @@ echo: echo : echo:word echo :word +echo/ +echo / +echo/word +echo /word echo off now echo word(a)space@ echo word(a)space@@space@ @@ -47,6 +51,10 @@ echo: echo : echo:word echo :word +echo/ +echo / +echo/word +echo /word echo on again echo word(a)space@ echo word(a)space@@space@ diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 4dddc71..b222158 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -42,6 +42,18 @@ word @pwd@>echo :word(a)space@ :word +(a)pwd@>echo/ + + +(a)pwd@>echo /@space@ +/ + +(a)pwd@>echo/word +word + +(a)pwd@>echo /word(a)space@ +/word + @pwd@>echo off now(a)space@ off now @@ -93,6 +105,10 @@ word : word :word + +/ +word +/word on again word(a)space@ word(a)space@@space@ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1e42c47..7666329 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1853,17 +1853,20 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE if (context && echo_mode && *curPos && (*curPos != '@')) { static const WCHAR echoDot[] = {'e','c','h','o','.'}; static const WCHAR echoCol[] = {'e','c','h','o',':'}; + static const WCHAR echoSlash[] = {'e','c','h','o','/'}; const DWORD len = sizeof(echoDot)/sizeof(echoDot[0]); DWORD curr_size = strlenW(curPos); DWORD min_len = (curr_size < len ? curr_size : len); WCMD_show_prompt(); WCMD_output_asis(curPos); /* I don't know why Windows puts a space here but it does */ - /* Except for lines starting with 'echo.' or 'echo:'. Ask MS why */ + /* Except for lines starting with 'echo.', 'echo:' or 'echo/'. Ask MS why */ if (CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, curPos, min_len, echoDot, len) != CSTR_EQUAL && CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, - curPos, min_len, echoCol, len) != CSTR_EQUAL) + curPos, min_len, echoCol, len) != CSTR_EQUAL + && CompareStringW(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, + curPos, min_len, echoSlash, len) != CSTR_EQUAL) { WCMD_output_asis(spaceW); }

1 0

Adam Stachowicz : po: Update Polish translation.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: bc051b9f33ba7d3007c5232c3ea699b1ddb5aa52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc051b9f33ba7d3007c5232c3… Author: Adam Stachowicz <saibamenppl(a)gmail.com> Date: Mon Aug 17 13:36:13 2015 +0200 po: Update Polish translation. --- po/pl.po | 87 +++++++++++++++++++--------------------------------------------- 1 file changed, 25 insertions(+), 62 deletions(-) diff --git a/po/pl.po b/po/pl.po index 89b18af..dc7d51c 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1,21 +1,21 @@ # Polish translations for Wine # # Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>, 2011, 2012, 2013, 2014. +# Adam "Saibamen" Stachowicz <saibamenppl(a)gmail.com>, 2015. msgid "" msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2014-11-29 07:31+0100\n" -"Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com>\n" +"PO-Revision-Date: 2015-08-16 21:14+0200\n" +"Last-Translator: Adam Stachowicz <saibamenppl(a)gmail.com>\n" "Language-Team: Polish <kde-i18n-doc(a)kde.org>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " -"|| n%100>=20) ? 1 : 2);\n" +"X-Generator: Poedit 1.8.4\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -2738,11 +2738,6 @@ msgstr "" "Czy jesteś pewien, że chcesz usunąć ten certyfikat?" #: cryptui.rc:113 -#, fuzzy -#| msgid "" -#| "You will no longer be able to encrypt messages with these certificates, " -#| "or verify messages signed with it.\n" -#| "Are you sure you want to remove these certificates?" msgid "" "You will no longer be able to encrypt messages with these certificates, or " "verify messages signed with them.\n" @@ -3155,10 +3150,8 @@ msgid "&View Source" msgstr "&Pokaż źródło" #: hhctrl.rc:83 -#, fuzzy -#| msgid "Properties" msgid "Proper&ties" -msgstr "Właściwości" +msgstr "&Właściwości" #: hhctrl.rc:87 shdoclc.rc:79 shdoclc.rc:93 shdoclc.rc:117 shdoclc.rc:159 #: shdoclc.rc:183 user32.rc:60 wordpad.rc:104 @@ -7472,10 +7465,8 @@ msgid "Add Control" msgstr "Dodaj kontrolkę" #: oledlg.rc:34 -#, fuzzy -#| msgid "&Font..." msgid "&Convert..." -msgstr "&Czcionka..." +msgstr "&Konwertuj..." #: oledlg.rc:33 oleview.rc:40 msgid "&Object" @@ -8602,10 +8593,8 @@ msgid "Duplex:" msgstr "Dupleks:" #: wineps.rc:50 -#, fuzzy -#| msgid "&Setup" msgid "Setup" -msgstr "U&stawienia" +msgstr "Ustawienia" #: wininet.rc:42 wininet.rc:62 msgid "Realm" @@ -8928,10 +8917,6 @@ msgstr "" "lub czy połączenie sieciowe jest wciąż aktywne." #: winmm.rc:86 -#, fuzzy -#| msgid "" -#| "Cannot find the specified device. Make sure it is installed or that the " -#| "device name is spelled correctly." msgid "" "Cannot find the specified device. Make sure it is installed and that the " "device name is spelled correctly." @@ -9250,24 +9235,20 @@ msgstr "" "czy połączenie sieciowe jest aktywne." #: winmm.rc:136 -#, fuzzy -#| msgid "Wine Mono Installer" msgid "Wine Sound Mapper" -msgstr "Instalator Wine Mono" +msgstr "Mapper dźwięku Wine" #: winmm.rc:137 -#, fuzzy -#| msgid "column" msgid "Volume" -msgstr "kolumna" +msgstr "Głośność" #: winmm.rc:138 msgid "Master Volume" -msgstr "" +msgstr "Główna głośność" #: winmm.rc:139 msgid "Mute" -msgstr "" +msgstr "Wycisz" #: winspool.rc:37 msgid "Print to File" @@ -11585,10 +11566,8 @@ msgid "Error: Invalid command line parameters\n" msgstr "Błąd: Niewłaściwe parametry wiersza poleceń\n" #: reg.rc:37 -#, fuzzy -#| msgid "Error: Unable to add keys to remote machine\n" msgid "Error: Unable to access remote machine\n" -msgstr "Błąd: Nie można dodać kluczy do zdalnej maszyny\n" +msgstr "Błąd: Błąd dostępu do zdalnej maszyny\n" #: reg.rc:38 msgid "" @@ -11596,10 +11575,8 @@ msgid "" msgstr "Błąd: System nie mógł znaleźć podanej wartości lub klucza rejestru\n" #: reg.rc:39 -#, fuzzy -#| msgid "Unsupported type.\n" msgid "Error: Unsupported type\n" -msgstr "Niewspierany typ.\n" +msgstr "Błąd: Niewspierany typ\n" #: regedit.rc:34 msgid "&Registry" @@ -13198,14 +13175,12 @@ msgid "&Test Sound" msgstr "Próba dźwięku" #: winecfg.rc:277 winecfg.rc:90 -#, fuzzy -#| msgid "Wine configuration" msgid "Speaker configuration" -msgstr "Ustawienia Wine" +msgstr "Konfiguracja głośników" #: winecfg.rc:280 msgid "Speakers:" -msgstr "" +msgstr "Głośniki:" #: winecfg.rc:288 msgid "Appearance" @@ -13313,21 +13288,19 @@ msgstr "(Domyślne systemowe)" #: winecfg.rc:91 msgid "5.1 Surround" -msgstr "" +msgstr "Dźwięk przestrzenny w układzie 5.1" #: winecfg.rc:92 -#, fuzzy -#| msgid "graphic" msgid "Quadraphonic" -msgstr "grafika" +msgstr "Kwadrofonia" #: winecfg.rc:93 msgid "Stereo" -msgstr "" +msgstr "Stereo" #: winecfg.rc:94 msgid "Mono" -msgstr "" +msgstr "Mono" #: winecfg.rc:54 msgid "" @@ -13588,16 +13561,12 @@ msgid "Command history" msgstr "Historia poleceń" #: wineconsole.rc:69 -#, fuzzy -#| msgid "Buffer zone" msgid "&Buffer size:" -msgstr "Strefa bufora" +msgstr "Rozmiar &bufora:" #: wineconsole.rc:72 -#, fuzzy -#| msgid "&Remove doubles" msgid "&Remove duplicates" -msgstr "&Usuń powtórzenia" +msgstr "&Usuń duplikaty" #: wineconsole.rc:74 msgid "Popup menu" @@ -13612,22 +13581,16 @@ msgid "S&hift" msgstr "S&hift" #: wineconsole.rc:78 -#, fuzzy -#| msgid "&Close console" msgid "Console" -msgstr "&Zamknij konsolę" +msgstr "Konsola" #: wineconsole.rc:79 -#, fuzzy -#| msgid "Quick edit" msgid "&Quick Edit mode" -msgstr "Szybka edycja" +msgstr "Tryb szybkiej edycji" #: wineconsole.rc:80 -#, fuzzy -#| msgid "&Expert mode" msgid "&Insert mode" -msgstr "Tryb &eksperta" +msgstr "Tryb wstaw&iania" #: wineconsole.rc:88 msgid "&Font"

1 0

Jacek Caban : ieframe: Update back/ forward navigation state in CMDID_EXPLORER_UPDATEHISTORY handler.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 5a2aa4a8a8d407b56f8836e94b7dfec1e237dbd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a2aa4a8a8d407b56f8836e94… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 18 14:01:08 2015 +0200 ieframe: Update back/forward navigation state in CMDID_EXPLORER_UPDATEHISTORY handler. --- dlls/ieframe/dochost.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index a6582b1..0823797 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -749,6 +749,7 @@ static HRESULT WINAPI ClOleCommandTarget_Exec(IOleCommandTarget *iface, switch(nCmdID) { case CMDID_EXPLORER_UPDATEHISTORY: update_travellog(This); + update_navigation_commands(This); return S_OK; default:

1 0

Jacek Caban : ieframe: Don't add about: URLs to travellog.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 16bfe07639a179f686e389221564df981d5c09e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16bfe07639a179f686e389221… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Aug 18 14:00:47 2015 +0200 ieframe: Don't add about: URLs to travellog. --- dlls/ieframe/dochost.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 3c7afb6..3de1d21 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -395,6 +395,13 @@ static void update_travellog(DocHost *This) { travellog_entry_t *new_entry; + static const WCHAR about_schemeW[] = {'a','b','o','u','t',':'}; + + if(This->url && !strncmpiW(This->url, about_schemeW, sizeof(about_schemeW)/sizeof(*about_schemeW))) { + TRACE("Skipping about URL\n"); + return; + } + if(!This->travellog.log) { This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); if(!This->travellog.log)

1 0

Józef Kucia : d3d10core: Do not use '\n' in the middle of TRACEs.
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 1cb7878beb3070bc1428b234e19a92e0f0f9515d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cb7878beb3070bc1428b234e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Aug 18 00:53:23 2015 +0200 d3d10core: Do not use '\n' in the middle of TRACEs. --- dlls/d3d10core/device.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 05e8de5..7996710 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -316,8 +316,8 @@ static void STDMETHODCALLTYPE d3d10_device_DrawIndexedInstanced(ID3D10Device1 *i { struct d3d10_device *device = impl_from_ID3D10Device(iface); - TRACE("iface %p, instance_index_count %u, instance_count %u, start_index_location %u,\n" - "\tbase_vertex_location %d, start_instance_location %u.\n", + TRACE("iface %p, instance_index_count %u, instance_count %u, start_index_location %u, " + "base_vertex_location %d, start_instance_location %u.\n", iface, instance_index_count, instance_count, start_index_location, base_vertex_location, start_instance_location); @@ -795,8 +795,8 @@ static void STDMETHODCALLTYPE d3d10_device_ResolveSubresource(ID3D10Device1 *ifa ID3D10Resource *dst_resource, UINT dst_subresource_idx, ID3D10Resource *src_resource, UINT src_subresource_idx, DXGI_FORMAT format) { - FIXME("iface %p, dst_resource %p, dst_subresource_idx %u,\n" - "\tsrc_resource %p, src_subresource_idx %u, format %s stub!\n", + FIXME("iface %p, dst_resource %p, dst_subresource_idx %u, " + "src_resource %p, src_subresource_idx %u, format %s stub!\n", iface, dst_resource, dst_subresource_idx, src_resource, src_subresource_idx, debug_dxgi_format(format)); } @@ -1731,8 +1731,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateInputLayout(ID3D10Device1 *i struct d3d10_input_layout *object; HRESULT hr; - TRACE("iface %p, element_descs %p, element_count %u, shader_byte_code %p," - "\tshader_byte_code_length %lu, input_layout %p\n", + TRACE("iface %p, element_descs %p, element_count %u, shader_byte_code %p, " + "shader_byte_code_length %lu, input_layout %p\n", iface, element_descs, element_count, shader_byte_code, shader_byte_code_length, input_layout); @@ -1815,8 +1815,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateGeometryShaderWithStreamOutp const void *byte_code, SIZE_T byte_code_length, const D3D10_SO_DECLARATION_ENTRY *output_stream_decls, UINT output_stream_decl_count, UINT output_stream_stride, ID3D10GeometryShader **shader) { - FIXME("iface %p, byte_code %p, byte_code_length %lu, output_stream_decls %p,\n" - "\toutput_stream_decl_count %u, output_stream_stride %u, shader %p stub!\n", + FIXME("iface %p, byte_code %p, byte_code_length %lu, output_stream_decls %p, " + "output_stream_decl_count %u, output_stream_stride %u, shader %p stub!\n", iface, byte_code, byte_code_length, output_stream_decls, output_stream_decl_count, output_stream_stride, shader); @@ -2134,8 +2134,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CheckCounter(ID3D10Device1 *iface, const D3D10_COUNTER_DESC *desc, D3D10_COUNTER_TYPE *type, UINT *active_counters, char *name, UINT *name_length, char *units, UINT *units_length, char *description, UINT *description_length) { - FIXME("iface %p, desc %p, type %p, active_counters %p, name %p, name_length %p,\n" - "\tunits %p, units_length %p, description %p, description_length %p stub!\n", + FIXME("iface %p, desc %p, type %p, active_counters %p, name %p, name_length %p, " + "units %p, units_length %p, description %p, description_length %p stub!\n", iface, desc, type, active_counters, name, name_length, units, units_length, description, description_length);

1 0

Henri Verbeet : d2d1: Implement d2d_text_renderer_DrawInlineObject().
by Alexandre Julliard Aug. 18, 2015

Aug. 18, 2015

Module: wine Branch: master Commit: 57eec429c66355b33e2ed42b9f68d4f0e2768532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57eec429c66355b33e2ed42b9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 18 11:24:13 2015 +0200 d2d1: Implement d2d_text_renderer_DrawInlineObject(). --- dlls/d2d1/render_target.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 7d80ef5..61233cb 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1483,10 +1483,10 @@ static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawStrikethrough(IDWriteText static HRESULT STDMETHODCALLTYPE d2d_text_renderer_DrawInlineObject(IDWriteTextRenderer *iface, void *ctx, float origin_x, float origin_y, IDWriteInlineObject *object, BOOL is_sideways, BOOL is_rtl, IUnknown *effect) { - FIXME("iface %p, ctx %p, origin_x %.8e, origin_y %.8e, object %p, is_sideways %#x, is_rtl %#x, effect %p stub!\n", + TRACE("iface %p, ctx %p, origin_x %.8e, origin_y %.8e, object %p, is_sideways %#x, is_rtl %#x, effect %p.\n", iface, ctx, origin_x, origin_y, object, is_sideways, is_rtl, effect); - return E_NOTIMPL; + return IDWriteInlineObject_Draw(object, ctx, iface, origin_x, origin_y, is_sideways, is_rtl, effect); } static const struct IDWriteTextRendererVtbl d2d_text_renderer_vtbl =

1 0