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

Dmitry Timoshkov : user32: Make FlashWindowEx tests pass under Windows.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 9d538e43bee43a73f0cc392916c6a5af772dc4e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d538e43bee43a73f0cc39291… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 7 23:55:08 2012 +0800 user32: Make FlashWindowEx tests pass under Windows. --- dlls/user32/tests/win.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 34f13ce..4f343da 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -6710,7 +6710,7 @@ static void test_FlashWindowEx(void) SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret, "FlashWindowEx succeeded\n"); + todo_wine ok(!ret, "previous window state should not be active\n"); finfo.cbSize = sizeof(FLASHWINFO) - 1; SetLastError(0xdeadbeef); @@ -6750,7 +6750,7 @@ static void test_FlashWindowEx(void) SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - todo_wine ok(!ret, "FlashWindowEx succeeded\n"); + ok(ret, "previous window state should be active\n"); ok(finfo.cbSize == sizeof(FLASHWINFO), "FlashWindowEx modified cdSize to %x\n", finfo.cbSize); ok(finfo.hwnd == hwnd, "FlashWindowEx modified hwnd to %p\n", finfo.hwnd); @@ -6761,7 +6761,8 @@ static void test_FlashWindowEx(void) finfo.dwFlags = FLASHW_STOP; SetLastError(0xdeadbeef); ret = pFlashWindowEx(&finfo); - ok(ret, "FlashWindowEx failed with %d\n", GetLastError()); +todo_wine + ok(!ret, "previous window state should not be active\n"); DestroyWindow( hwnd ); }

1 0

Piotr Caban : msvcrt: Handle negative file->_cnt value in _flsbuf function.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: c39793087d11a562655e636489042c2bc2baf63c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c39793087d11a562655e63648… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Feb 7 10:14:03 2012 +0100 msvcrt: Handle negative file->_cnt value in _flsbuf function. --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/tests/file.c | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index b27a40f..c15e33f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3088,7 +3088,7 @@ int CDECL MSVCRT__flsbuf(int c, MSVCRT_FILE* file) if(file->_bufsiz) { int res = 0; - if(file->_cnt == 0) + if(file->_cnt <= 0) res = msvcrt_flush_buffer(file); if(!res) { *file->_ptr++ = c; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index e7b7353..b9b904d 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -544,10 +544,21 @@ static void test_flsbuf( void ) bufmodes[bufmode], 0, ret); ret = _flsbuf(0xff,tempfh); ok(0xff == ret, "_flsbuf(0xff,tempfh) with bufmode %x expected %x got %x\n", - bufmodes[bufmode], 0, ret); + bufmodes[bufmode], 0xff, ret); ret = _flsbuf(0xffffffff,tempfh); ok(0xff == ret, "_flsbuf(0xffffffff,tempfh) with bufmode %x expected %x got %x\n", - bufmodes[bufmode], 0, ret); + bufmodes[bufmode], 0xff, ret); + if(tempfh->_base) { + fputc('x', tempfh); + tempfh->_cnt = -1; + tempfh->_base[1] = 'a'; + ret = _flsbuf(0xab,tempfh); + ok(ret == 0xab, "_flsbuf(0xab,tempfh) with bufmode %x expected 0xab got %x\n", + bufmodes[bufmode], ret); + ok(tempfh->_base[1] == 'a', "tempfh->_base[1] should not be changed (%d)\n", + tempfh->_base[1]); + } + fclose(tempfh); }

1 0

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

Feb. 7, 2012

Module: wine Branch: master Commit: 8116d8a53d7467381a26f42d62ba2715b2b8c3c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8116d8a53d7467381a26f42d6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 7 10:09:59 2012 +0100 inetcpl.cpl: Remove an obsolete resource attribute. --- dlls/inetcpl.cpl/inetcpl.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/inetcpl.cpl/inetcpl.rc b/dlls/inetcpl.cpl/inetcpl.rc index 49ef5e6..f6ecaac 100644 --- a/dlls/inetcpl.cpl/inetcpl.rc +++ b/dlls/inetcpl.cpl/inetcpl.rc @@ -23,7 +23,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE +STRINGTABLE BEGIN IDS_CPL_NAME "Internet Settings" IDS_CPL_INFO "Configure Wine Internet Browser and related settings"

1 0

Dmitry Timoshkov : psapi: Make sure that NtQueryVirtualMemory( MemorySectionName) succeeds under Windows 2000 too.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 48a2a467cd7b59c9bfbdd28740e5b621e926b6a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a2a467cd7b59c9bfbdd2874… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 7 11:17:56 2012 +0800 psapi: Make sure that NtQueryVirtualMemory(MemorySectionName) succeeds under Windows 2000 too. --- dlls/psapi/tests/psapi_main.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 09a56f7..2087881 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -198,7 +198,7 @@ static BOOL nt_get_mapped_file_name(HANDLE process, LPVOID addr, LPWSTR name, DW { MEMORY_SECTION_NAME *section_name; WCHAR *buf; - SIZE_T buf_len; + SIZE_T buf_len, ret_len; NTSTATUS status; if (!pNtQueryVirtualMemory) return FALSE; @@ -206,12 +206,16 @@ static BOOL nt_get_mapped_file_name(HANDLE process, LPVOID addr, LPWSTR name, DW buf_len = len * sizeof(WCHAR) + sizeof(MEMORY_SECTION_NAME); buf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, buf_len); - status = pNtQueryVirtualMemory(process, addr, MemorySectionName, buf, buf_len, NULL); + ret_len = 0xdeadbeef; + status = pNtQueryVirtualMemory(process, addr, MemorySectionName, buf, buf_len, &ret_len); todo_wine - ok(!status || broken(status == STATUS_ACCESS_VIOLATION) /* win2k */, "NtQueryVirtualMemory error %x\n", status); + ok(!status, "NtQueryVirtualMemory error %x\n", status); + /* FIXME: remove once Wine is fixed */ if (status) return FALSE; section_name = (MEMORY_SECTION_NAME *)buf; + ok(ret_len == section_name->SectionFileName.MaximumLength + sizeof(*section_name), "got %lu, %u\n", + ret_len, section_name->SectionFileName.MaximumLength); ok((char *)section_name->SectionFileName.Buffer == (char *)section_name + sizeof(*section_name), "got %p, %p\n", section_name, section_name->SectionFileName.Buffer); ok(section_name->SectionFileName.MaximumLength == section_name->SectionFileName.Length + sizeof(WCHAR), "got %u, %u\n",

1 0

Alexandre Julliard : mshtml: Use the current AppData folder instead of the default one as profile directory .
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: 0aeb38bb4c3ed8cc9b9da374c42072bebe292939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aeb38bb4c3ed8cc9b9da374c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 6 17:39:57 2012 -0600 mshtml: Use the current AppData folder instead of the default one as profile directory. --- dlls/mshtml/nsembed.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index fdc6286..d96bcaf 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -118,7 +118,7 @@ static nsresult create_profile_directory(void) nsresult nsres; HRESULT hres; - hres = SHGetFolderPathW(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_DEFAULT, path); + hres = SHGetFolderPathW(NULL, CSIDL_APPDATA, NULL, SHGFP_TYPE_CURRENT, path); if(FAILED(hres)) { ERR("SHGetFolderPath failed: %08x\n", hres); return NS_ERROR_FAILURE;

1 0

Francois Gouget : shell32: Fix the name of the 'Application Data' folders.
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: c0338afebbf7b8a3a1a30615696fa86fbba24a2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0338afebbf7b8a3a1a306156… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Feb 7 01:04:07 2012 +0100 shell32: Fix the name of the 'Application Data' folders. --- dlls/shell32/shellpath.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 31110ac..8d1c70b 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -1023,7 +1023,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_RoamingAppData, CSIDL_Type_User, AppDataW, - AppDataW + Application_DataW }, { /* 0x1b - CSIDL_PRINTHOOD */ &FOLDERID_PrintHood, @@ -1035,7 +1035,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_LocalAppData, CSIDL_Type_User, Local_AppDataW, - Local_AppDataW + Local_Settings_Application_DataW }, { /* 0x1d - CSIDL_ALTSTARTUP */ &GUID_NULL, @@ -1077,7 +1077,7 @@ static const CSIDL_DATA CSIDL_Data[] = &FOLDERID_ProgramData, CSIDL_Type_AllUsers, Common_AppDataW, - AppDataW + Application_DataW }, { /* 0x24 - CSIDL_WINDOWS */ &FOLDERID_Windows,

1 0

Aric Stewart : quartz: AMFilterData_ParseFilterData returns a pointer to a pointer to filter data .
by Alexandre Julliard Feb. 7, 2012

Feb. 7, 2012

Module: wine Branch: master Commit: c3e2407664de1455554c6c151919ed75e61c725b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e2407664de1455554c6c151… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Feb 6 11:02:43 2012 -0600 quartz: AMFilterData_ParseFilterData returns a pointer to a pointer to filter data. --- .gitignore | 1 + dlls/dxdiagn/provider.c | 4 ++- dlls/quartz/filtermapper.c | 4 +- dlls/quartz/tests/Makefile.in | 2 + dlls/quartz/tests/fil_data.idl | 50 ++++++++++++++++++++++++++++ dlls/quartz/tests/filtermapper.c | 68 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 126 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b97d5b5..f0fcf66 100644 --- a/.gitignore +++ b/.gitignore @@ -114,6 +114,7 @@ dlls/qmgrprxy/qmgrprxy_p.c dlls/quartz/fil_data.h dlls/quartz/quartz_strmif.h dlls/quartz/quartz_strmif_p.c +dlls/quartz/tests/fil_data.h dlls/rpcrt4/epm.h dlls/rpcrt4/epm_c.c dlls/rpcrt4/tests/server.h diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index bb4ce08..db407b0 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -1323,6 +1323,7 @@ static HRESULT fill_filter_data_information(IDxDiagContainerImpl_Container *subc HRESULT hr; IFilterMapper2 *pFileMapper = NULL; IAMFilterData *pFilterData = NULL; + BYTE *ppRF = NULL; REGFILTER2 *pRF = NULL; WCHAR bufferW[10]; ULONG j; @@ -1338,9 +1339,10 @@ static HRESULT fill_filter_data_information(IDxDiagContainerImpl_Container *subc if (FAILED(hr)) goto cleanup; - hr = IAMFilterData_ParseFilterData(pFilterData, pData, cb, (BYTE **)&pRF); + hr = IAMFilterData_ParseFilterData(pFilterData, pData, cb, (BYTE **)&ppRF); if (FAILED(hr)) goto cleanup; + pRF = ((REGFILTER2**)ppRF)[0]; snprintfW(bufferW, sizeof(bufferW)/sizeof(bufferW[0]), szVersionFormat, pRF->dwVersion); hr = add_bstr_property(subcont, szVersionW, bufferW); diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 7d7599f..8950caa 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -1732,14 +1732,14 @@ static HRESULT WINAPI AMFilterData_ParseFilterData(IAMFilterData* iface, { FilterMapper3Impl *This = impl_from_IAMFilterData(iface); HRESULT hr = S_OK; - REGFILTER2 *prf2; + static REGFILTER2 *prf2; TRACE("(%p/%p)->(%p, %d, %p)\n", This, iface, pData, cb, ppRegFilter2); prf2 = CoTaskMemAlloc(sizeof(*prf2)); if (!prf2) return E_OUTOFMEMORY; - *ppRegFilter2 = (BYTE *)prf2; + *ppRegFilter2 = (BYTE *)&prf2; hr = FM2_ReadFilterData(pData, prf2); if (FAILED(hr)) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 55528ab..ae5fbac 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -11,4 +11,6 @@ C_SRCS = \ referenceclock.c \ videorenderer.c +IDL_H_SRCS = fil_data.idl + @MAKE_TEST_RULES@ diff --git a/dlls/quartz/tests/fil_data.idl b/dlls/quartz/tests/fil_data.idl new file mode 100644 index 0000000..93cdf1e --- /dev/null +++ b/dlls/quartz/tests/fil_data.idl @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2009 Vitaliy Margolen + * + * 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 + */ + +import "objidl.idl"; +import "strmif.idl"; +import "unknwn.idl"; + + +/***************************************************************************** + * IAMFilterData interface + * + * Notes: + * - This interface is deprecated and IFilterMapper2 should be used instead. + * - There is no full replacement for IAMFilterData::ParseFilterData short of manually + * parsing out the REGFILTER2 struct from the binary blob. + */ +[ + object, + uuid(97f7c4d4-547b-4a5f-8332-536430ad2e4d), + pointer_default(unique) +] +interface IAMFilterData : IUnknown +{ + typedef [unique] IAMFilterData *LPIAMFILTERDATA; + + HRESULT ParseFilterData( + [in] BYTE * rgbFilterData, + [in] ULONG cb, + [out] BYTE ** prgbRegFilter2); + + HRESULT CreateFilterData( + [in] REGFILTER2 * prf2, + [out] BYTE ** prgbFilterData, + [out] ULONG * pcb); +} diff --git a/dlls/quartz/tests/filtermapper.c b/dlls/quartz/tests/filtermapper.c index cd3ea17..2209af4 100644 --- a/dlls/quartz/tests/filtermapper.c +++ b/dlls/quartz/tests/filtermapper.c @@ -24,6 +24,9 @@ #include "winbase.h" #include "initguid.h" #include "dshow.h" +#include "winternl.h" + +#include "fil_data.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -467,6 +470,70 @@ static void test_register_filter_with_null_clsMinorType(void) if (pMapper) IFilterMapper2_Release(pMapper); } +static void test_parse_filter_data(void) +{ + static const BYTE data_block[] = { + 0x02,0x00,0x00,0x00,0xff,0xff,0x5f,0x00,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x70,0x69,0x33, + 0x00,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x30,0x74,0x79,0x33,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x31,0x70,0x69,0x33, + 0x08,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x30,0x74,0x79,0x33,0x00,0x00,0x00,0x00,0x60,0x00,0x00,0x00,0x70,0x00,0x00,0x00,0x76,0x69,0x64,0x73, + 0x00,0x00,0x10,0x00,0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00}; + + BYTE *prgbRegFilter2 = NULL; + REGFILTER2 *pRegFilter = NULL; + IFilterMapper2 *pMapper = NULL; + SAFEARRAYBOUND saBound; + SAFEARRAY *psa = NULL; + LPBYTE pbSAData = NULL; + HRESULT hr; + + IAMFilterData *pData = NULL; + + hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, + &IID_IFilterMapper2, (LPVOID*)&pMapper); + ok((hr == S_OK || broken(hr != S_OK)), "CoCreateInstance failed with %x\n", hr); + if (FAILED(hr)) goto out; + + hr = IFilterMapper2_QueryInterface(pMapper, &IID_IAMFilterData, (LPVOID*)&pData); + ok((hr == S_OK || broken(hr != S_OK)), "Unable to find IID_IAMFilterData interface\n"); + if (FAILED(hr)) goto out; + + saBound.lLbound = 0; + saBound.cElements = sizeof(data_block); + psa = SafeArrayCreate(VT_UI1, 1, &saBound); + ok(psa != NULL, "Unable to crate safe array\n"); + if (!psa) goto out; + hr = SafeArrayAccessData(psa, (LPVOID *)&pbSAData); + ok(hr == S_OK, "Unable to access array data\n"); + if (FAILED(hr)) goto out; + memcpy(pbSAData, data_block, sizeof(data_block)); + + hr = IAMFilterData_ParseFilterData(pData, pbSAData, sizeof(data_block), &prgbRegFilter2); + /* We cannot do anything here. prgbRegFilter2 is very unstable */ + /* Pre Vista, this is a stack pointer so anything that changes the stack invalidats it */ + /* Post Vista, it is a static pointer in the data section of the module */ + pRegFilter =((REGFILTER2**)prgbRegFilter2)[0]; + ok (hr==S_OK,"Failed to Parse filter Data\n"); + + ok(IsBadReadPtr(prgbRegFilter2,sizeof(REGFILTER2**))==0,"Bad read pointer returned\n"); + ok(IsBadReadPtr(pRegFilter,sizeof(REGFILTER2*))==0,"Bad read pointer for FilterData\n"); + ok(pRegFilter->dwMerit == 0x5fffff,"Incorrect merit returned\n"); + +out: + if (pRegFilter) + CoTaskMemFree(pRegFilter); + if (psa) + { + SafeArrayUnaccessData(psa); + SafeArrayDestroy(psa); + } + if (pData) + IAMFilterData_Release(pData); + if (pMapper) + IFilterMapper2_Release(pMapper); +} START_TEST(filtermapper) { @@ -476,6 +543,7 @@ START_TEST(filtermapper) test_legacy_filter_registration(); test_ifiltermapper_from_filtergraph(); test_register_filter_with_null_clsMinorType(); + test_parse_filter_data(); CoUninitialize(); }

1 0

André Hentschel : comctl32/tests: Add some more thumb length tests.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 91a63ad08ceaff3179a23fa813fa811bc20366b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91a63ad08ceaff3179a23fa81… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 5 16:43:34 2012 +0100 comctl32/tests: Add some more thumb length tests. --- dlls/comctl32/tests/trackbar.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 725490f..eb320d5 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -298,6 +298,12 @@ static const struct message thumb_length_test_seq[] = { { WM_PAINT, sent|defwinproc}, { TBM_GETTHUMBLENGTH, sent}, { TBM_GETTHUMBLENGTH, sent}, + { WM_SIZE, sent}, + { WM_PAINT, sent|defwinproc}, + { TBM_GETTHUMBLENGTH, sent}, + { WM_SIZE, sent}, + { WM_PAINT, sent|defwinproc}, + { TBM_GETTHUMBLENGTH, sent}, {0} }; @@ -306,6 +312,10 @@ static const struct message parent_thumb_length_test_seq[] = { { WM_NOTIFY, sent}, { WM_CTLCOLORSTATIC, sent}, { WM_NOTIFY, sent}, + { WM_CTLCOLORSTATIC, sent}, + { WM_NOTIFY, sent}, + { WM_CTLCOLORSTATIC, sent}, + { WM_NOTIFY, sent}, {0} }; @@ -742,8 +752,17 @@ static void test_thumb_length(HWND hWndTrackbar){ r = SendMessage(hWndTrackbar, TBM_GETTHUMBLENGTH, 0,0); expect(20, r); + r = SendMessage(hWndTrackbar, WM_SIZE, 0,0); + expect(0, r); + r = SendMessage(hWndTrackbar, TBM_GETTHUMBLENGTH, 0,0); + expect(20, r); + r = SendMessage(hWndTrackbar, WM_SIZE, 0, MAKELPARAM(50, 50) ); + expect(0, r); + r = SendMessage(hWndTrackbar, TBM_GETTHUMBLENGTH, 0,0); + expect(20, r); + ok_sequence(sequences, TRACKBAR_SEQ_INDEX, thumb_length_test_seq, "thumb length test sequence", TRUE); - ok_sequence(sequences, PARENT_SEQ_INDEX, parent_thumb_length_test_seq, "parent thumb lenth test sequence", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_thumb_length_test_seq, "parent thumb length test sequence", TRUE); } static void test_tic_settings(HWND hWndTrackbar){

1 0

Francois Gouget : po: Fix some typography issues in the Serbian (Latin) translation.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: bc220525a7ffb7dd0ea359da0a1d552350e02f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc220525a7ffb7dd0ea359da0… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 6 14:51:59 2012 +0100 po: Fix some typography issues in the Serbian (Latin) translation. Also mark a few incomplete translations as fuzzy. --- po/sr_RS(a)latin.po | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/po/sr_RS(a)latin.po b/po/sr_RS(a)latin.po index 15c04f6..24bb152 100644 --- a/po/sr_RS(a)latin.po +++ b/po/sr_RS(a)latin.po @@ -3145,6 +3145,7 @@ msgid "Transferring" msgstr "Prenos" #: gphoto2.rc:43 +#, fuzzy msgid "Transferring... Please Wait" msgstr "Prenošenje..." @@ -3153,6 +3154,7 @@ msgid "Connecting to camera" msgstr "Povezivanje sa kamerom" #: gphoto2.rc:52 +#, fuzzy msgid "Connecting to camera... Please Wait" msgstr "Povezivanje sa kamerom..." @@ -7101,7 +7103,7 @@ msgstr "&Podesi..." #: msvfw32.rc:40 msgid "&About" -msgstr "&O programu..." +msgstr "&O programu" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -7577,6 +7579,7 @@ msgid "Scanning" msgstr "Pretraga" #: sane.rc:44 +#, fuzzy msgid "SCANNING... Please Wait" msgstr "Pretraživanje..." @@ -12613,15 +12616,15 @@ msgstr "" #: winecfg.rc:162 msgid "Allow the window manager to &decorate the windows" -msgstr "Dozvoli temi da &ukrasi prozor." +msgstr "Dozvoli temi da &ukrasi prozor" #: winecfg.rc:163 msgid "Allow the &window manager to control the windows" -msgstr "Dozvoli &menadžeru prozora da upravlja prozorom." +msgstr "Dozvoli &menadžeru prozora da upravlja prozorom" #: winecfg.rc:164 msgid "&Emulate a virtual desktop" -msgstr "&Emulacija veštačkog desktopa." +msgstr "&Emulacija veštačkog desktopa" #: winecfg.rc:166 msgid "Desktop &size:" @@ -12718,7 +12721,7 @@ msgstr "&Dodaj..." #: winecfg.rc:229 msgid "Auto&detect" -msgstr "Auto&matski..." +msgstr "Auto&matski" #: winecfg.rc:232 msgid "&Path:"

1 0

Francois Gouget : po: Fix some typography issues in the Serbian (Cyrillic) translation.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 764ee39c080be2cee0861c75933a08e36d218a6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=764ee39c080be2cee0861c759… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 6 14:52:04 2012 +0100 po: Fix some typography issues in the Serbian (Cyrillic) translation. Also mark a few incomplete translations as fuzzy. --- po/sr_RS(a)cyrillic.po | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/po/sr_RS(a)cyrillic.po b/po/sr_RS(a)cyrillic.po index 352850a..27b1c4d 100644 --- a/po/sr_RS(a)cyrillic.po +++ b/po/sr_RS(a)cyrillic.po @@ -3064,6 +3064,7 @@ msgid "Transferring" msgstr "Пренос" #: gphoto2.rc:43 +#, fuzzy msgid "Transferring... Please Wait" msgstr "Преношење..." @@ -3072,6 +3073,7 @@ msgid "Connecting to camera" msgstr "Повезивање са камером" #: gphoto2.rc:52 +#, fuzzy msgid "Connecting to camera... Please Wait" msgstr "Повезивање са камером..." @@ -7007,7 +7009,7 @@ msgstr "&Подеси..." #: msvfw32.rc:40 msgid "&About" -msgstr "&О програму..." +msgstr "&О програму" #: msvfw32.rc:44 msgid "Compression &Quality:" @@ -7483,6 +7485,7 @@ msgid "Scanning" msgstr "Претрага" #: sane.rc:44 +#, fuzzy msgid "SCANNING... Please Wait" msgstr "Претраживање..."

1 0

Francois Gouget : po: Remove or fuzzy invalid Turkish shell folder translations.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 0cd8c8f24a191cdd2d0ee9c086242df5c9f0d45d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cd8c8f24a191cdd2d0ee9c08… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 6 14:56:21 2012 +0100 po: Remove or fuzzy invalid Turkish shell folder translations. --- po/tr.po | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/po/tr.po b/po/tr.po index 1880f39..e7f464b 100644 --- a/po/tr.po +++ b/po/tr.po @@ -8152,15 +8152,17 @@ msgstr "" #: shell32.rc:204 msgid "Start Menu" -msgstr "Start Menu" +msgstr "" #: shell32.rc:205 +#, fuzzy msgid "My Music" -msgstr "Belgelerim\\Müziğim" +msgstr "Müziğim" #: shell32.rc:206 +#, fuzzy msgid "My Videos" -msgstr "Belgelerim\\Vidyolarım" +msgstr "Vidyolarım" #: shell32.rc:207 #, fuzzy @@ -8170,15 +8172,15 @@ msgstr "Masaüstü" #: shell32.rc:208 msgid "NetHood" -msgstr "NetHood" +msgstr "" #: shell32.rc:209 msgid "Templates" -msgstr "Templates" +msgstr "" #: shell32.rc:210 msgid "PrintHood" -msgstr "PrintHood" +msgstr "" #: shell32.rc:211 winhlp32.rc:45 msgid "History" @@ -8186,11 +8188,12 @@ msgstr "" #: shell32.rc:212 msgid "Program Files" -msgstr "Program Files" +msgstr "" #: shell32.rc:214 +#, fuzzy msgid "My Pictures" -msgstr "Belgelerim\\Resimlerim" +msgstr "Resimlerim" #: shell32.rc:215 #, fuzzy @@ -8204,24 +8207,26 @@ msgstr "Belgeler" #: shell32.rc:217 #, fuzzy msgid "Administrative Tools" -msgstr "Start Menu\\Programlar\\Yönetimsel Araçlar" +msgstr "Yönetimsel Araçlar" #: shell32.rc:218 +#, fuzzy msgid "Music" -msgstr "Belgeler\\Müziğim" +msgstr "Müziğim" #: shell32.rc:219 +#, fuzzy msgid "Pictures" -msgstr "Belgeler\\Resimlerim" +msgstr "Resimlerim" #: shell32.rc:220 +#, fuzzy msgid "Videos" -msgstr "Belgeler\\Videolarım" +msgstr "Videolarım" #: shell32.rc:213 -#, fuzzy msgid "Program Files (x86)" -msgstr "Program Files" +msgstr "" #: shell32.rc:221 #, fuzzy

1 0

Francois Gouget : po: Fix a typography issue in the Telugu translation.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 33afb7766bee016dd4483c827b144e7219d0c947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33afb7766bee016dd4483c827… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Feb 6 14:38:43 2012 +0100 po: Fix a typography issue in the Telugu translation. --- po/te.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/te.po b/po/te.po index 6cd4cc4..3cf00f7 100644 --- a/po/te.po +++ b/po/te.po @@ -8930,7 +8930,7 @@ msgstr "డిజిటల్ (&t)" #: clock.rc:32 notepad.rc:50 winecfg.rc:289 winefile.rc:60 wordpad.rc:81 msgid "&Font..." -msgstr "ఫాంట్... (&F)" +msgstr "ఫాంట్ (&F)..." #: clock.rc:34 msgid "&Without Titlebar"

1 0

Andrew Eikum : wineoss.drv: Don' t call GETOSPACE immediately after device initialization.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: bb1ca5811458f59297f1b82205f563e0c07b5ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb1ca5811458f59297f1b8220… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Feb 6 09:24:46 2012 -0600 wineoss.drv: Don't call GETOSPACE immediately after device initialization. --- dlls/wineoss.drv/mmdevdrv.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 22ee924..35ff7d7 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -875,7 +875,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, { ACImpl *This = impl_from_IAudioClient(iface); int i; - audio_buf_info bi; HRESULT hr; TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, @@ -955,18 +954,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return E_OUTOFMEMORY; } - if(This->dataflow == eRender){ - if(ioctl(This->fd, SNDCTL_DSP_GETOSPACE, &bi) < 0){ - WARN("GETOSPACE failed: %d (%s)\n", errno, strerror(errno)); - CoTaskMemFree(This->fmt); - This->fmt = NULL; - LeaveCriticalSection(&This->lock); - return E_FAIL; - } - - This->oss_bufsize_bytes = bi.bytes; - } - This->vols = HeapAlloc(GetProcessHeap(), 0, fmt->nChannels * sizeof(float)); if(!This->vols){ CoTaskMemFree(This->fmt); @@ -980,6 +967,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->share = mode; This->flags = flags; + This->oss_bufsize_bytes = 0; EnterCriticalSection(&g_sessions_lock);

1 0

Dmitry Timoshkov : user32: Add a bunch of RealChildWindowFromPoint tests.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: 8c7f3964b5dc9ea667ac61ba9cbae6b043e2d322 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c7f3964b5dc9ea667ac61ba9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 6 19:58:45 2012 +0800 user32: Add a bunch of RealChildWindowFromPoint tests. --- dlls/user32/tests/win.c | 233 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 233 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8c7f3964b5dc9ea667ac6…

1 0

Dmitry Timoshkov : user32: RealChildWindowFromPoint should skip invisible windows.
by Alexandre Julliard Feb. 6, 2012

Feb. 6, 2012

Module: wine Branch: master Commit: ea7e9ed2eb7eff90599c578c085f35578c6593f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7e9ed2eb7eff90599c578c0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 6 19:59:00 2012 +0800 user32: RealChildWindowFromPoint should skip invisible windows. --- dlls/user32/tests/win.c | 2 +- dlls/user32/winpos.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index e760b4a..7d753f7 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7038,9 +7038,9 @@ static void test_child_window_from_point(void) DestroyWindow(parent); -todo_wine ok(!found_invisible, "found %d invisible windows\n", found_invisible); 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); todo_wine diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 57ccb81..42f6b3e 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -376,7 +376,7 @@ HWND WINAPI ChildWindowFromPoint( HWND hwndParent, POINT pt ) */ HWND WINAPI RealChildWindowFromPoint( HWND hwndParent, POINT pt ) { - return ChildWindowFromPointEx( hwndParent, pt, CWP_SKIPTRANSPARENT ); + return ChildWindowFromPointEx( hwndParent, pt, CWP_SKIPTRANSPARENT | CWP_SKIPINVISIBLE ); } /*******************************************************************

1 0