February 2012 - Wine-Commits

Frédéric Delanoy : po: Fix some trailing ellipses errors in Japanese translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 7accb957a3c444c119a38e898b5d1edc27229d99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7accb957a3c444c119a38e898… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:13 2012 +0100 po: Fix some trailing ellipses errors in Japanese translation. --- po/ja.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ja.po b/po/ja.po index aa9157f..5e1a7be 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2174,7 +2174,7 @@ msgstr "ファイル名(&F):" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 msgid "B&rowse..." -msgstr "参照(&R)" +msgstr "参照(&R)..." #: cryptui.rc:294 msgid "" @@ -3177,7 +3177,7 @@ msgstr "ウィンドウ(&W)" #: ieframe.rc:31 view.rc:30 winhlp32.rc:29 msgid "&Open..." -msgstr "開く(&O)" +msgstr "開く(&O)..." #: ieframe.rc:33 notepad.rc:30 wordpad.rc:31 msgid "Save &as..."

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in the Swedish translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 5afd771ca3787e7bf9dcd4bfed48806e6e81c4ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=5afd771ca3787e7bf9dcd4bfe… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 10:30:04 2012 +0100 po: Fix some trailing ellipses errors in the Swedish translation. --- po/sv.po | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/po/sv.po b/po/sv.po index 3a74699..04ade75 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2186,7 +2186,7 @@ msgstr "&Filnamn:" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 msgid "B&rowse..." -msgstr "B&läddra" +msgstr "B&läddra..." #: cryptui.rc:294 #, fuzzy @@ -7779,7 +7779,7 @@ msgstr "&Öppna:" #: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234 #: winefile.rc:132 msgid "&Browse..." -msgstr "&Bläddra" +msgstr "&Bläddra..." #: shell32.rc:135 shell32.rc:139 winefile.rc:107 msgid "Size" @@ -12497,7 +12497,7 @@ msgstr "" #: winecfg.rc:150 msgid "&Add application..." -msgstr "&Lägg till program" +msgstr "&Lägg till program..." #: winecfg.rc:151 msgid "&Remove application" @@ -12570,7 +12570,7 @@ msgstr "Befintliga &åsidosättningar:" #: winecfg.rc:190 msgid "&Edit..." -msgstr "R&edigera" +msgstr "R&edigera..." #: winecfg.rc:196 msgid "Edit Override" @@ -12624,7 +12624,7 @@ msgstr "&Lägg till..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "Upptäck aut&omatiskt..." +msgstr "Upptäck aut&omatiskt" #: winecfg.rc:232 msgid "&Path:" @@ -13695,6 +13695,7 @@ msgid "Always on &top" msgstr "Alltid &överst" #: winhlp32.rc:56 +#, fuzzy msgid "&About Wine Help" msgstr "&Info..."

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in Catalan translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: d431969c18ec171dfe2bf844bc91a3bc962c034d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d431969c18ec171dfe2bf844b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:11 2012 +0100 po: Fix some trailing ellipses errors in Catalan translation. --- po/ca.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ca.po b/po/ca.po index 888b2aa..1d789ea 100644 --- a/po/ca.po +++ b/po/ca.po @@ -3116,7 +3116,7 @@ msgstr "Actualitza" #: hhctrl.rc:62 winhlp32.rc:31 msgid "&Print..." -msgstr "&Imprimeix" +msgstr "&Imprimeix..." #: hhctrl.rc:28 taskmgr.rc:89 msgid "&Contents" @@ -3199,7 +3199,7 @@ msgstr "Finestra" #: ieframe.rc:31 view.rc:30 winhlp32.rc:29 msgid "&Open..." -msgstr "&Obre" +msgstr "&Obre..." #: ieframe.rc:33 notepad.rc:30 wordpad.rc:31 msgid "Save &as..." @@ -3260,7 +3260,7 @@ msgstr "Inici" #: ieframe.rc:68 winhlp32.rc:66 msgid "Print..." -msgstr "Imprimeix" +msgstr "Imprimeix..." #: ieframe.rc:73 msgid "Address" @@ -11950,7 +11950,7 @@ msgstr "" #: taskmgr.rc:518 msgid "Select Columns" -msgstr "Selecciona Columnes..." +msgstr "Selecciona Columnes" #: taskmgr.rc:523 msgid ""

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: e050861907b43a692380be99856ec068146114bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e050861907b43a692380be998… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Feb 6 23:40:37 2012 +0100 po: Update French translation. --- po/fr.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/po/fr.po b/po/fr.po index 7b72e31..11a37ae 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-01-26 22:30+0100\n" +"PO-Revision-Date: 2012-02-06 23:40+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -2966,7 +2966,7 @@ msgstr "Actions" #: dinput.rc:51 msgid "Mapping" -msgstr "Mapping" +msgstr "Configuration" #: dinput.rc:53 msgid "Show Assigned First" @@ -13124,11 +13124,11 @@ msgstr "Menu contextuel" #: wineconsole.rc:67 msgid "&Control" -msgstr "&Control" +msgstr "&Contrôle" #: wineconsole.rc:68 msgid "S&hift" -msgstr "S&hift" +msgstr "Ma&j" #: wineconsole.rc:69 msgid "Quick edit"

1 0

Huw Davies : oleaut32: [restricted] members with negative dispids may still be called.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 0425a110d92ba61fcb3638443bc7782c9dbd7cde URL: http://source.winehq.org/git/wine.git/?a=commit;h=0425a110d92ba61fcb3638443… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 7 14:28:05 2012 +0000 oleaut32: [restricted] members with negative dispids may still be called. --- dlls/oleaut32/tests/tmarshal.c | 38 ++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 6 +++++ dlls/oleaut32/tests/tmarshal_dispids.h | 2 + dlls/oleaut32/typelib.c | 7 +++++- 4 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 2fbc2e0..e261464 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -660,6 +660,20 @@ static HRESULT WINAPI Widget_put_prop_req_arg( return S_OK; } +static HRESULT WINAPI Widget_restrict(IWidget* iface, INT *i) +{ + trace("restrict\n"); + *i = DISPID_TM_RESTRICTED; + return S_OK; +} + +static HRESULT WINAPI Widget_neg_restrict(IWidget* iface, INT *i) +{ + trace("neg_restrict\n"); + *i = DISPID_TM_NEG_RESTRICTED; + return S_OK; +} + static const struct IWidgetVtbl Widget_VTable = { Widget_QueryInterface, @@ -696,6 +710,8 @@ static const struct IWidgetVtbl Widget_VTable = Widget_ByRefUInt, Widget_put_prop_opt_arg, Widget_put_prop_req_arg, + Widget_restrict, + Widget_neg_restrict }; static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject) @@ -1511,6 +1527,28 @@ static void test_typelibmarshal(void) ok_ole_success(hr, ITypeInfo_Invoke); VariantClear(&varresult); + /* restricted member */ + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.cArgs = 0; + dispparams.rgvarg = NULL; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_RESTRICTED, &IID_NULL, 0x40c, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok( hr == DISP_E_MEMBERNOTFOUND, "got %08x\n", hr ); + VariantClear(&varresult); + + /* restricted member with -ve memid (not restricted) */ + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.cArgs = 0; + dispparams.rgvarg = NULL; + VariantInit(&varresult); + hr = IDispatch_Invoke(pDispatch, DISPID_TM_NEG_RESTRICTED, &IID_NULL, 0x40c, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); + ok( hr == S_OK, "got %08x\n", hr ); + ok(V_VT(&varresult) == VT_I4, "got %x\n", V_VT(&varresult)); + ok(V_I4(&varresult) == DISPID_TM_NEG_RESTRICTED, "got %x\n", V_I4(&varresult)); + VariantClear(&varresult); + IDispatch_Release(pDispatch); IWidget_Release(pWidget); diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 30b6d8f..88c13bf 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -149,6 +149,12 @@ library TestTypelib [id(DISPID_TM_PROP_REQ_ARG), propput] HRESULT prop_req_arg([in] INT req, [in] INT i); + + [id(DISPID_TM_RESTRICTED), restricted] + HRESULT restrict([out, retval] INT *i); + + [id(DISPID_TM_NEG_RESTRICTED), restricted] + HRESULT neg_restrict([out, retval] INT *i); } [ diff --git a/dlls/oleaut32/tests/tmarshal_dispids.h b/dlls/oleaut32/tests/tmarshal_dispids.h index 0e49505..8570fe9 100644 --- a/dlls/oleaut32/tests/tmarshal_dispids.h +++ b/dlls/oleaut32/tests/tmarshal_dispids.h @@ -41,6 +41,8 @@ #define DISPID_TM_PROP_OPT_ARG 22 #define DISPID_TM_PROP_REQ_ARG 23 #define DISPID_TM_VARCARRAY 24 +#define DISPID_TM_RESTRICTED 25 +#define DISPID_TM_NEG_RESTRICTED -26 #define DISPID_NOA_BSTRRET 1 #define DISPID_NOA_ERROR 2 diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 07e294b..95cdc36 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -6241,6 +6241,11 @@ DispCallFunc( #endif } +static inline BOOL func_restricted( const FUNCDESC *desc ) +{ + return (desc->wFuncFlags & FUNCFLAG_FRESTRICTED) && (desc->memid >= 0); +} + #define INVBUF_ELEMENT_SIZE \ (sizeof(VARIANTARG) + sizeof(VARIANTARG) + sizeof(VARIANTARG *) + sizeof(VARTYPE)) #define INVBUF_GET_ARG_ARRAY(buffer, params) (buffer) @@ -6297,7 +6302,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( pFuncInfo = &This->funcdescs[fdc]; if ((memid == pFuncInfo->funcdesc.memid) && (wFlags & pFuncInfo->funcdesc.invkind) && - (pFuncInfo->funcdesc.wFuncFlags & FUNCFLAG_FRESTRICTED) == 0) + !func_restricted( &pFuncInfo->funcdesc )) break; }

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in Polish translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: a9a41b77e0f049978a47cbb057f25ccc0e643549 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a41b77e0f049978a47cbb05… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:16 2012 +0100 po: Fix some trailing ellipses errors in Polish translation. --- po/pl.po | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/po/pl.po b/po/pl.po index e18cab6..708dccc 100644 --- a/po/pl.po +++ b/po/pl.po @@ -54,7 +54,7 @@ msgstr "&Modyfikuj..." #: appwiz.rc:66 appwiz.rc:42 cryptui.rc:343 msacm32.rc:37 winecfg.rc:191 #: winecfg.rc:228 wordpad.rc:245 msgid "&Remove" -msgstr "&Usuń..." +msgstr "&Usuń" #: appwiz.rc:72 msgid "Support Information" @@ -217,7 +217,7 @@ msgstr "Wszystkie pliki (*.*)" #: appwiz.rc:43 msgid "&Modify/Remove" -msgstr "&Zmień/Usuń..." +msgstr "&Zmień/Usuń" #: appwiz.rc:48 msgid "Downloading..." @@ -2181,8 +2181,9 @@ msgid "&File name:" msgstr "&Nazwa pliku:" #: cryptui.rc:293 cryptui.rc:315 cryptui.rc:429 winecfg.rc:295 +#, fuzzy msgid "B&rowse..." -msgstr "Przeglądaj" +msgstr "Przeglądaj..." #: cryptui.rc:294 msgid "" @@ -3089,6 +3090,7 @@ msgid "Connecting to camera" msgstr "Nawiązywanie połączenia z aparatem" #: gphoto2.rc:52 +#, fuzzy msgid "Connecting to camera... Please Wait" msgstr "Nawiązywanie połączenia z aparatem..." @@ -3218,7 +3220,7 @@ msgstr "&Drukuj..." #: ieframe.rc:37 wordpad.rc:34 msgid "Print previe&w" -msgstr "&Podgląd wydruku..." +msgstr "&Podgląd wydruku" #: ieframe.rc:44 msgid "&Toolbars" @@ -3275,7 +3277,7 @@ msgstr "Szukanie %s" #: ieframe.rc:79 msgid "Start downloading %s" -msgstr "Rozpocznij pobieranie %s..." +msgstr "Rozpocznij pobieranie %s" #: ieframe.rc:80 msgid "Downloading %s" @@ -6764,7 +6766,7 @@ msgstr "Kon&figuruj..." #: msvfw32.rc:40 msgid "&About" -msgstr "&Informacje..." +msgstr "&Informacje" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -7344,7 +7346,7 @@ msgstr "Kop&iuj tło" #: shdoclc.rc:44 msgid "Set as &Desktop Item" -msgstr "Ustaw jako &element pulpitu..." +msgstr "Ustaw jako &element pulpitu" #: shdoclc.rc:46 shdoclc.rc:95 shdoclc.rc:117 user32.rc:62 msgid "Select &All" @@ -7776,7 +7778,7 @@ msgstr "&Otwórz:" #: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234 #: winefile.rc:132 msgid "&Browse..." -msgstr "&Przeglądaj" +msgstr "&Przeglądaj..." #: shell32.rc:135 shell32.rc:139 winefile.rc:107 msgid "Size" @@ -12549,7 +12551,7 @@ msgstr "Istniejące reguły:" #: winecfg.rc:190 msgid "&Edit..." -msgstr "&Edycja" +msgstr "&Edycja..." #: winecfg.rc:196 msgid "Edit Override" @@ -13296,7 +13298,7 @@ msgstr "Zmień &nazwę..." #: winefile.rc:31 msgid "Propert&ies\tAlt+Enter" -msgstr "&Właściwości...\tAlt+Enter" +msgstr "&Właściwości\tAlt+Enter" #: winefile.rc:33 msgid "&Run..." @@ -13316,7 +13318,7 @@ msgstr "Podłącz &dysk sieciowy..." #: winefile.rc:42 msgid "&Disconnect Network Drive" -msgstr "&Odłącz dysk sieciowy..." +msgstr "&Odłącz dysk sieciowy" #: winefile.rc:48 msgid "&Name"

1 0

Frédéric Delanoy : po: Fix some trailing ellipses errors in Korean translation.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: abd0b0fc177659322df306e6a50d255ed910491f URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd0b0fc177659322df306e6a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Feb 7 00:35:14 2012 +0100 po: Fix some trailing ellipses errors in Korean translation. --- po/ko.po | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/po/ko.po b/po/ko.po index c97bd65..0004a72 100644 --- a/po/ko.po +++ b/po/ko.po @@ -282,7 +282,7 @@ msgstr "압축안됨" #: browseui.rc:25 msgid "Canceling..." -msgstr "취소하는 중.." +msgstr "취소하는 중..." #: comctl32.rc:49 winefile.rc:159 msgid "Properties for %s" @@ -3192,7 +3192,7 @@ msgstr "인쇄(&I)..." #: ieframe.rc:37 wordpad.rc:34 msgid "Print previe&w" -msgstr "인쇄 미리보기(&W)..." +msgstr "인쇄 미리보기(&W)" #: ieframe.rc:44 msgid "&Toolbars" @@ -3216,7 +3216,7 @@ msgstr "즐겨찾기 추가(&A)..." #: ieframe.rc:57 msgid "&About Internet Explorer" -msgstr "인터넷 익스플로어에 관하여(&A)..." +msgstr "인터넷 익스플로어에 관하여(&A)" #: ieframe.rc:87 msgid "Open URL" @@ -7739,7 +7739,7 @@ msgstr "열기(&O):" #: shell32.rc:339 progman.rc:179 progman.rc:198 progman.rc:215 winecfg.rc:234 #: winefile.rc:132 msgid "&Browse..." -msgstr "찾기(&B)" +msgstr "찾기(&B)..." #: shell32.rc:135 shell32.rc:139 winefile.rc:107 msgid "Size" @@ -9191,8 +9191,9 @@ msgid "&Always on Top" msgstr "항상 앞에 (&A)" #: clock.rc:42 +#, fuzzy msgid "&About Clock" -msgstr "시계 정보(&A)..." +msgstr "시계 정보(&A)" #: clock.rc:48 msgid "Clock"

1 0

Aric Stewart : gdi32: Keep our internal generated system links separate and append them to any user defined system links .
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: e7a79b5565803f4d38d5c54276579ea589e50246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a79b5565803f4d38d5c5427… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Feb 7 07:18:34 2012 -0600 gdi32: Keep our internal generated system links separate and append them to any user defined system links. --- dlls/gdi32/freetype.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 97 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index afbc971..ce9556d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -532,6 +532,10 @@ static const WCHAR system_link[] = {'S','o','f','t','w','a','r','e','\\','M','i' 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','F','o','n','t','L','i','n','k','\\', 'S','y','s','t','e','m','L','i','n','k',0}; +static const WCHAR internal_system_link[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', + 'F','o','n','t','L','i','n','k','\\', + 'S','y','s','t','e','m','L','i','n','k',0}; + /**************************************** * Notes on .fon files * @@ -2007,6 +2011,97 @@ static BOOL init_system_links(void) RegCloseKey(hkey); } + if(RegOpenKeyW(HKEY_CURRENT_USER, internal_system_link, &hkey) == ERROR_SUCCESS) + { + RegQueryInfoKeyW(hkey, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &max_val, &max_data, NULL, NULL); + value = HeapAlloc(GetProcessHeap(), 0, (max_val + 1) * sizeof(WCHAR)); + data = HeapAlloc(GetProcessHeap(), 0, max_data); + val_len = max_val + 1; + data_len = max_data; + index = 0; + while(RegEnumValueW(hkey, index++, value, &val_len, NULL, &type, (LPBYTE)data, &data_len) == ERROR_SUCCESS) + { + BOOL existing = FALSE; + memset(&fs, 0, sizeof(fs)); + psub = get_font_subst(&font_subst_list, value, -1); + /* Don't store fonts that are only substitutes for other fonts */ + if(psub) + { + TRACE("%s: Internal SystemLink entry for substituted font, ignoring\n", debugstr_w(value)); + goto next_internal; + } + + LIST_FOR_EACH_ENTRY(font_link, &system_links, SYSTEM_LINKS, entry) + { + if(!strcmpiW(font_link->font_name, value)) + { + existing = TRUE; + break; + } + } + + if (!existing) + { + font_link = HeapAlloc(GetProcessHeap(), 0, sizeof(*font_link)); + font_link->font_name = strdupW(value); + list_init(&font_link->links); + } + + for(entry = data; (char*)entry < (char*)data + data_len && *entry != 0; entry = next) + { + WCHAR *face_name; + CHILD_FONT *child_font; + + TRACE("Internal entry %s: %s\n", debugstr_w(value), debugstr_w(entry)); + + next = entry + strlenW(entry) + 1; + + face_name = strchrW(entry, ','); + if(face_name) + { + *face_name++ = 0; + while(isspaceW(*face_name)) + face_name++; + + psub = get_font_subst(&font_subst_list, face_name, -1); + if(psub) + face_name = psub->to.name; + } + face = find_face_from_filename(entry, face_name); + if(!face) + { + TRACE("Unable to find file %s face name %s\n", debugstr_w(entry), debugstr_w(face_name)); + continue; + } + + child_font = HeapAlloc(GetProcessHeap(), 0, sizeof(*child_font)); + child_font->face = face; + child_font->font = NULL; + fs.fsCsb[0] |= face->fs.fsCsb[0]; + fs.fsCsb[1] |= face->fs.fsCsb[1]; + TRACE("Adding file %s index %ld\n", child_font->face->file, child_font->face->face_index); + list_add_tail(&font_link->links, &child_font->entry); + } + family = find_family_from_name(font_link->font_name); + if(family) + { + LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) + { + face->fs_links = fs; + } + } + if (!existing) + list_add_tail(&system_links, &font_link->entry); + next_internal: + val_len = max_val + 1; + data_len = max_data; + } + + HeapFree(GetProcessHeap(), 0, value); + HeapFree(GetProcessHeap(), 0, data); + RegCloseKey(hkey); + } + /* Explicitly add an entry for the system font, this links to Tahoma and any links that Tahoma has */ @@ -2798,9 +2893,6 @@ static void update_font_info(void) } if (!done) FIXME("there is no font defaults for codepages %u,%u\n", ansi_cp, oem_cp); - - /* Clear out system links */ - RegDeleteKeyW(HKEY_LOCAL_MACHINE, system_link); } static void populate_system_links(HKEY hkey, const WCHAR *name, const WCHAR *const *values) @@ -2885,7 +2977,7 @@ static void update_system_links(void) static const WCHAR MS_Shell_Dlg[] = {'M','S',' ','S','h','e','l','l',' ','D','l','g',0}; - if (!RegCreateKeyExW(HKEY_LOCAL_MACHINE, system_link, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, &disposition)) + if (!RegCreateKeyExW(HKEY_CURRENT_USER, internal_system_link, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &hkey, &disposition)) { if (disposition == REG_OPENED_EXISTING_KEY) { @@ -2924,7 +3016,7 @@ static void update_system_links(void) if (!done) WARN("there is no SystemLink default list for MS Shell Dlg %s\n", debugstr_w(psub->to.name)); } else - WARN("failed to create SystemLink key\n"); + WARN("failed to create Internal SystemLink key\n"); }

1 0

Dmitry Timoshkov : user32: Fix a couple of typos.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 39a4b5fa94269441552ad724d789e432767646cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=39a4b5fa94269441552ad724d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 7 11:18:15 2012 +0800 user32: Fix a couple of typos. --- dlls/user32/tests/win.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 7d753f7..34f13ce 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6957,10 +6957,10 @@ static int window_to_index(HWND hwnd, HWND *window, int size) static void test_child_window_from_point(void) { - static int real_child_pos[] = { 14,15,16,17,18,19,20,21,24,25,26,27,42,43, - 44,45,46,47,48,49,52,53,54,55,51,50,23,22,-1 }; - static int real_child_pos_nt4[] = { 14,15,16,17,20,21,24,25,26,27,42,43,44,45, - 48,49,52,53,54,55,51,50,47,46,23,22,19,18,-1 }; + static const int real_child_pos[] = { 14,15,16,17,18,19,20,21,24,25,26,27,42,43, + 44,45,46,47,48,49,52,53,54,55,51,50,23,22,-1 }; + static const int real_child_pos_nt4[] = { 14,15,16,17,20,21,24,25,26,27,42,43,44,45, + 48,49,52,53,54,55,51,50,47,46,23,22,19,18,-1 }; WNDCLASSA cls; HWND hwnd, parent, window[100]; POINT pt; @@ -7042,9 +7042,9 @@ static void test_child_window_from_point(void) ok(found_disabled, "found %d disabled windows\n", found_disabled); todo_wine ok(found_groupbox == 4, "found %d groupbox windows\n", found_groupbox); - ok(found_httransparent, "found %d found_httransparent windows\n", found_httransparent); + ok(found_httransparent, "found %d httransparent windows\n", found_httransparent); todo_wine - ok(found_extransparent, "found %d found_extransparent windows\n", found_extransparent); + ok(found_extransparent, "found %d extransparent windows\n", found_extransparent); ret = UnregisterClass("my_button", cls.hInstance); ok(ret, "UnregisterClass(my_button) failed\n");

1 0

Michael Stefaniuc : comctl32: Remove an obsolete resource attribute.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 482a5746eec602cfbbbe925288a1ef3b127538ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=482a5746eec602cfbbbe92528… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 7 10:18:59 2012 +0100 comctl32: Remove an obsolete resource attribute. --- dlls/comctl32/tests/rsrc.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/rsrc.rc b/dlls/comctl32/tests/rsrc.rc index 76b3642..34b8362 100644 --- a/dlls/comctl32/tests/rsrc.rc +++ b/dlls/comctl32/tests/rsrc.rc @@ -64,7 +64,7 @@ FONT 8, "MS Shell Dlg" LTEXT "This has been a test property sheet!", -1, 10, 6, 170, 8 } -IDD_PROP_PAGE_MESSAGE_TEST DIALOG DISCARDABLE 0, 0, 339, 179 +IDD_PROP_PAGE_MESSAGE_TEST DIALOG 0, 0, 339, 179 STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Message Test" BEGIN

1 0