April 2012 - Wine-commits - list.winehq.org

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXFontImpl_QueryInterface().
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 74c2ddc908dd862800644463edaf0028e9425ba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74c2ddc908dd862800644463e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 10 22:06:22 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXFontImpl_QueryInterface(). --- dlls/d3dx9_36/font.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index a27f80a..1904c68 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -43,17 +43,21 @@ static inline ID3DXFontImpl *impl_from_ID3DXFont(ID3DXFont *iface) return CONTAINING_RECORD(iface, ID3DXFontImpl, ID3DXFont_iface); } -static HRESULT WINAPI ID3DXFontImpl_QueryInterface(ID3DXFont *iface, REFIID riid, void **object) +static HRESULT WINAPI ID3DXFontImpl_QueryInterface(ID3DXFont *iface, REFIID riid, void **out) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - TRACE("(%p): QueryInterface from %s\n", This, debugstr_guid(riid)); - if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXFont)) { + if (IsEqualGUID(riid, &IID_ID3DXFont) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *object=This; + *out = iface; return S_OK; } - WARN("(%p)->(%s, %p): not found\n", iface, debugstr_guid(riid), *object); + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; return E_NOINTERFACE; }

1 0

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXEffectPoolImpl_QueryInterface ().
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 6e05c1415409d2daf12306de7150358ca1121f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e05c1415409d2daf12306de7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 10 22:06:23 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXEffectPoolImpl_QueryInterface(). --- dlls/d3dx9_36/effect.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index fa28ae0..0a07ddf 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5917,15 +5917,13 @@ static inline struct ID3DXEffectPoolImpl *impl_from_ID3DXEffectPool(ID3DXEffectP /*** IUnknown methods ***/ static HRESULT WINAPI ID3DXEffectPoolImpl_QueryInterface(ID3DXEffectPool *iface, REFIID riid, void **object) { - struct ID3DXEffectPoolImpl *This = impl_from_ID3DXEffectPool(iface); - - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), object); + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXEffectPool)) { - This->ID3DXEffectPool_iface.lpVtbl->AddRef(iface); - *object = This; + iface->lpVtbl->AddRef(iface); + *object = iface; return S_OK; }

1 0

Christian Costa : d3drm: Display filename when loading data from a file.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: cde9a571c9f40926e947b59a491babcf57ec44c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cde9a571c9f40926e947b59a4… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 10 22:09:17 2012 +0200 d3drm: Display filename when loading data from a file. --- dlls/d3drm/d3drm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index c067c27..7d92858 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1277,6 +1277,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3* iface, LPVOID ObjSourc else if (LOFlags == D3DRMLOAD_FROMFILE) { load_options = DXFILELOAD_FROMFILE; + TRACE("Loading from file %s\n", debugstr_a(ObjSource)); } else {

1 0

Lucas Zawacki : dinput: Don't trace DIEFFECT members if they don' t contain valid data.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 706d9df8d95a8fff59c4f776ab803c6a1e738d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=706d9df8d95a8fff59c4f776a… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Apr 10 21:57:58 2012 -0300 dinput: Don't trace DIEFFECT members if they don't contain valid data. --- dlls/dinput/effect_linuxinput.c | 42 +++++++++++++++++++++++++------------- 1 files changed, 27 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index ca43b17..0fb183f 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -173,7 +173,7 @@ static void _dump_DICUSTOMFORCE(LPCDICUSTOMFORCE frc) } } -static void _dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid) +static void _dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid, DWORD dwFlags) { unsigned int i; DWORD type = _typeFromGUID(guid); @@ -188,26 +188,38 @@ static void _dump_DIEFFECT(LPCDIEFFECT eff, REFGUID guid) _dump_DIEFFECT_flags(eff->dwFlags); TRACE(" - dwDuration: %d\n", eff->dwDuration); TRACE(" - dwGain: %d\n", eff->dwGain); + if (eff->dwGain > 10000) - WARN("dwGain is out of range (>10,000)\n"); + WARN("dwGain is out of range (>10,000)\n"); + TRACE(" - dwTriggerButton: %d\n", eff->dwTriggerButton); TRACE(" - dwTriggerRepeatInterval: %d\n", eff->dwTriggerRepeatInterval); - TRACE(" - cAxes: %d\n", eff->cAxes); - TRACE(" - rgdwAxes: %p\n", eff->rgdwAxes); - if (TRACE_ON(dinput) && eff->rgdwAxes) { - TRACE(" "); - for (i = 0; i < eff->cAxes; ++i) - TRACE("%d ", eff->rgdwAxes[i]); - TRACE("\n"); - } TRACE(" - rglDirection: %p\n", eff->rglDirection); - TRACE(" - lpEnvelope: %p\n", eff->lpEnvelope); TRACE(" - cbTypeSpecificParams: %d\n", eff->cbTypeSpecificParams); TRACE(" - lpvTypeSpecificParams: %p\n", eff->lpvTypeSpecificParams); + + /* Only trace some members if dwFlags indicates they have data */ + if (dwFlags & DIEP_AXES) { + TRACE(" - cAxes: %d\n", eff->cAxes); + TRACE(" - rgdwAxes: %p\n", eff->rgdwAxes); + + if (TRACE_ON(dinput) && eff->rgdwAxes) { + TRACE(" "); + for (i = 0; i < eff->cAxes; ++i) + TRACE("%d ", eff->rgdwAxes[i]); + TRACE("\n"); + } + } + + if (dwFlags & DIEP_ENVELOPE) { + TRACE(" - lpEnvelope: %p\n", eff->lpEnvelope); + if (eff->lpEnvelope != NULL) + _dump_DIENVELOPE(eff->lpEnvelope); + } + if (eff->dwSize > sizeof(DIEFFECT_DX5)) - TRACE(" - dwStartDelay: %d\n", eff->dwStartDelay); - if (eff->lpEnvelope != NULL) - _dump_DIENVELOPE(eff->lpEnvelope); + TRACE(" - dwStartDelay: %d\n", eff->dwStartDelay); + if (type == DIEFT_CONSTANTFORCE) { if (eff->cbTypeSpecificParams != sizeof(DICONSTANTFORCE)) { WARN("Effect claims to be a constant force but the type-specific params are the wrong size!\n"); @@ -539,7 +551,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( TRACE("(this=%p,%p,%d)\n", This, peff, dwFlags); - _dump_DIEFFECT(peff, &This->guid); + _dump_DIEFFECT(peff, &This->guid, dwFlags); if ((dwFlags & ~DIEP_NORESTART & ~DIEP_NODOWNLOAD & ~DIEP_START) == 0) { /* set everything */

1 0

Jacek Caban : mshtml: Return self as a parent of global top window.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 325f8c8172dbcdf1d510ae9760e5645ea4d6243e URL: http://source.winehq.org/git/wine.git/?a=commit;h=325f8c8172dbcdf1d510ae976… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 11 11:03:43 2012 +0200 mshtml: Return self as a parent of global top window. --- dlls/mshtml/htmlwindow.c | 10 +++++----- dlls/mshtml/tests/dom.c | 11 +++++++++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 4242a77..5f68e6d 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -779,14 +779,14 @@ static HRESULT WINAPI HTMLWindow2_get_name(IHTMLWindow2 *iface, BSTR *p) static HRESULT WINAPI HTMLWindow2_get_parent(IHTMLWindow2 *iface, IHTMLWindow2 **p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); + TRACE("(%p)->(%p)\n", This, p); - if(This->parent) { - *p = &This->parent->IHTMLWindow2_iface; - IHTMLWindow2_AddRef(*p); - }else - *p = NULL; + if(!This->parent) + return IHTMLWindow2_get_self(&This->IHTMLWindow2_iface, p); + *p = &This->parent->IHTMLWindow2_iface; + IHTMLWindow2_AddRef(*p); return S_OK; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index b951724..4176394 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4479,7 +4479,7 @@ static void test_body_funs(IHTMLBodyElement *body) static void test_window(IHTMLDocument2 *doc) { - IHTMLWindow2 *window, *window2, *self; + IHTMLWindow2 *window, *window2, *self, *parent; IHTMLDocument2 *doc2 = NULL; IDispatch *disp; IUnknown *unk; @@ -4528,7 +4528,6 @@ static void test_window(IHTMLDocument2 *doc) ok(self == window2, "self != window2\n"); IHTMLWindow2_Release(window2); - IHTMLWindow2_Release(self); disp = NULL; hres = IHTMLDocument2_get_Script(doc, &disp); @@ -4551,6 +4550,14 @@ static void test_window(IHTMLDocument2 *doc) ok(hres == S_OK, "get_opener failed: %08x\n", hres); ok(V_VT(&v) == VT_EMPTY, "V_VT(opener) = %d\n", V_VT(&v)); + parent = NULL; + hres = IHTMLWindow2_get_parent(window, &parent); + ok(hres == S_OK, "get_parent failed: %08x\n", hres); + ok(parent != NULL, "parent == NULL\n"); + ok(parent == self, "parent != window\n"); + IHTMLWindow2_Release(parent); + IHTMLWindow2_Release(self); + test_window_name(window, NULL); set_window_name(window, "test"); test_window_length(window, 0);

1 0

Dmitry Timoshkov : fonts: Update cyrillic bitmap glyphs in Tahoma Bold.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 4f819f8efcd08e29a1a7650300e204839b43af2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f819f8efcd08e29a1a765030… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 11 19:09:53 2012 +0900 fonts: Update cyrillic bitmap glyphs in Tahoma Bold. --- fonts/tahomabd.sfd | 274 ++++++++++++++++++++++++++-------------------------- fonts/tahomabd.ttf | Bin 86440 -> 86520 bytes 2 files changed, 137 insertions(+), 137 deletions(-) diff --git a/fonts/tahomabd.sfd b/fonts/tahomabd.sfd index bdb7651..d3b6cbe 100644 --- a/fonts/tahomabd.sfd +++ b/fonts/tahomabd.sfd @@ -95,7 +95,7 @@ NameList: Adobe Glyph List DisplaySize: 9 AntiAlias: 1 FitToEm: 1 -WinInfo: 56 56 19 +WinInfo: 0 53 17 BeginPrivate: 10 BlueValues 27 [-30 0 1120 1177 1522 1522] OtherBlues 11 [-426 -426] @@ -10883,142 +10883,142 @@ BDFChar: 336 370 7 0 5 -2 6 bfn;Tbfk;c2uipY BDFChar: 337 371 6 0 4 -2 4 f\"j/GRt\l -BDFChar: 338 1040 6 0 4 0 6 -+Abm2G_h.U -BDFChar: 339 1041 6 1 5 0 6 -n:6&YOGNB+ -BDFChar: 340 1042 6 1 5 0 6 -n;raiOGNB+ -BDFChar: 341 1043 5 1 4 0 6 -n:6%>J:N.M -BDFChar: 342 1044 7 0 5 -1 6 -3(QS284`Z3 -BDFChar: 343 1045 6 1 4 0 6 -n:6&YJ:R+h -BDFChar: 344 1046 9 0 7 0 6 -JPn<e1fAl) -BDFChar: 345 1047 6 1 4 0 6 -i"-IX&.mb" -BDFChar: 346 1048 7 0 4 0 6 -#ah!XW5q4( -BDFChar: 347 1049 7 0 4 0 8 -5VN0DR&Ht)5QCca -BDFChar: 348 1050 6 1 5 0 6 -Lle:FTTGN@ +BDFChar: 338 1040 8 0 6 0 6 +3&k_jI)a/+ +BDFChar: 339 1041 7 0 5 0 6 +pqX]?bfoh^ +BDFChar: 340 1042 7 0 5 0 6 +prptWbfoh^ +BDFChar: 341 1043 6 0 4 0 6 +pqX\\^qd_c +BDFChar: 342 1044 8 0 6 -1 6 +4D\hMCi'*j +BDFChar: 343 1045 6 0 4 0 6 +pqX]?^qf^F +BDFChar: 344 1046 11 0 9 0 6 +beS(GD1FhND1HJRbeO2Y +BDFChar: 345 1047 7 0 5 0 6 +Gg$S@%*Wqr +BDFChar: 346 1048 7 0 5 0 6 +bhV"Om-Mpr +BDFChar: 347 1049 7 0 5 0 8 +82/9Ch#-O*bQ%VC +BDFChar: 348 1050 7 0 5 0 6 +bfn`/fZ_P> BDFChar: 349 1051 7 0 5 0 6 -4<u0t,XfQN -BDFChar: 350 1052 8 1 5 0 6 -LtLADW/-60 -BDFChar: 351 1053 7 1 4 0 6 -OH>RnOH>P( -BDFChar: 352 1054 7 0 5 0 6 -GfYPkKS4RM -BDFChar: 353 1055 7 1 4 0 6 -n;r`nOH>P( -BDFChar: 354 1056 6 1 4 0 6 -i/j%^i.-=X -BDFChar: 355 1057 6 0 4 0 6 -Geei[J:MkE -BDFChar: 356 1058 6 0 4 0 6 -p`L\%+<Vd, -BDFChar: 357 1059 6 0 4 0 6 -Le(?=+<WoL -BDFChar: 358 1060 8 0 5 0 6 -&:B_,PZ0UB -BDFChar: 359 1061 6 0 4 0 6 -Le(>b:f)rJ -BDFChar: 360 1062 7 1 5 -2 6 -J<5kSOHB5C#QOi) -BDFChar: 361 1063 6 1 4 0 6 -OH>QcE"EQ\ -BDFChar: 362 1064 10 1 7 0 6 -P*1ukP*5eE -BDFChar: 363 1065 10 1 8 -2 6 -P*1ukP*5hG!<<*" -BDFChar: 364 1066 7 0 5 0 6 -i#j.),U>JP -BDFChar: 365 1067 9 0 5 0 6 -KS5$NPa(e? -BDFChar: 366 1068 6 1 4 0 6 -J:N1.OHAB# -BDFChar: 367 1069 6 0 4 0 6 -@$h4E#RKo" -BDFChar: 368 1070 10 1 7 0 6 -]]?rH_SWqc -BDFChar: 369 1071 6 0 4 0 6 -3(SirGY!Vj -BDFChar: 370 1072 5 0 3 0 4 -?k@:=n,NFg -BDFChar: 371 1073 6 0 4 0 6 -0L.mBLkp!M -BDFChar: 372 1074 5 0 3 0 4 -n;uRin,NFg -BDFChar: 373 1075 4 0 2 0 4 -i.-?.J,fQL -BDFChar: 374 1076 6 0 4 -1 4 -E)9A-pkSnM -BDFChar: 375 1077 5 0 4 0 4 -E/=:>GQ7^D -BDFChar: 376 1078 8 0 5 0 4 -<*2+^PQ1[` -BDFChar: 377 1079 5 0 3 0 4 -E"HCgn,NFg -BDFChar: 378 1080 6 0 3 0 4 -&?rCc5QCca -BDFChar: 379 1081 6 0 3 0 6 -:gaj=Yg>W8 -BDFChar: 380 1082 5 1 4 0 4 -TV0)nO8o7\ -BDFChar: 381 1083 6 -1 3 0 4 -3(QS2a8c2? -BDFChar: 382 1084 7 0 4 0 4 -8D(G.#QOi) -BDFChar: 383 1085 6 0 3 1 3 -ODp9] +Hu*V8Ci%;q +BDFChar: 350 1052 9 0 7 0 6 +_rp4_gV^o/ +BDFChar: 351 1053 7 0 5 0 6 +bfn</bfn92 +BDFChar: 352 1054 8 0 6 0 6 +I)a1G`l<B+ +BDFChar: 353 1055 7 0 5 0 6 +r63C/bfn92 +BDFChar: 354 1056 7 0 5 0 6 +prpt+pqXZF +BDFChar: 355 1057 7 0 5 0 6 +Gg*t=^s%$' +BDFChar: 356 1058 7 0 5 0 6 +r%KfY0JG0\ +BDFChar: 357 1059 7 0 5 0 6 +bfjm:3&'7j +BDFChar: 358 1060 9 0 7 0 6 +(k15ogO9t> +BDFChar: 359 1061 7 0 5 0 6 +bfk;cGg+A3 +BDFChar: 360 1062 8 0 6 -2 6 +bfn;Tbfp%j"onW' +BDFChar: 361 1063 7 0 5 0 6 +bfn;THjgD` +BDFChar: 362 1064 11 0 9 0 6 +beVH<beVH<beVH<s1eU7 +BDFChar: 363 1065 11 0 10 -2 6 +beVH<beVH<beVH<s53lb!+5d, +BDFChar: 364 1066 8 0 6 0 6 +i*^qEAnHDj +BDFChar: 365 1067 10 0 8 0 6 +_19(a)Pq1-_?c%+&hq1&GF +BDFChar: 366 1068 7 0 5 0 6 +^qf`hbfoh^ +BDFChar: 367 1069 7 0 5 0 6 +Gg$SD%*Wqr +BDFChar: 368 1070 10 0 8 0 6 +cN)XKfmrmKfmqb+cN!qF +BDFChar: 369 1071 6 0 5 0 6 +I*BgYHu.", +BDFChar: 370 1072 6 0 4 0 4 +E#<iPGQ7^D +BDFChar: 371 1073 7 0 5 0 6 +(i[:cbfk;3 +BDFChar: 372 1074 6 0 4 0 4 +nC[6_n,NFg +BDFChar: 373 1075 5 0 3 0 4 +nA)iT^]4?7 +BDFChar: 374 1076 7 0 6 -1 4 +Hu*V8rl+p< +BDFChar: 375 1077 6 0 4 0 4 +E7js$GQ7^D +BDFChar: 376 1078 8 0 6 0 4 +epKH)ec5[M +BDFChar: 377 1079 6 0 4 0 4 +n/-*]n,NFg +BDFChar: 378 1080 7 0 5 0 4 +bhW-_bQ%VC +BDFChar: 379 1081 7 0 5 0 6 +82/9Cr9VW- +BDFChar: 380 1082 5 0 4 0 4 +f^RhgfDkmO +BDFChar: 381 1083 7 0 5 0 4 +4D\hMbQ%VC +BDFChar: 382 1084 8 0 6 0 4 +`pWiW`W,u= +BDFChar: 383 1085 7 0 5 0 4 +bfp"/bQ%VC BDFChar: 384 1086 6 0 4 0 4 -E/9=+Du]k< -BDFChar: 385 1087 6 0 3 1 4 -E0-0C +E7igqDu]k< +BDFChar: 385 1087 7 0 5 0 4 +r63C/bQ%VC BDFChar: 386 1088 6 0 4 -2 4 -n;)mVn:6#h +nCZCGnA)g> BDFChar: 387 1089 5 0 3 0 4 -E.EIhDu]k< -BDFChar: 388 1090 5 0 4 0 4 -p`L\%+92BA +E599)Du]k< +BDFChar: 388 1090 6 0 5 0 4 +r%KfY0E;(Q BDFChar: 389 1091 5 0 4 -2 4 -LlbG(a)+<\H" -BDFChar: 390 1092 8 0 6 -2 6 -&.j5PP*12(&-)\1 -BDFChar: 391 1093 5 0 3 0 4 -OC02=O8o7\ -BDFChar: 392 1094 6 0 4 -1 3 -OH>QK#QOi) -BDFChar: 393 1095 6 0 3 0 4 -OHArC&-)\1 -BDFChar: 394 1096 8 1 6 0 4 -Unjf^qu?]s -BDFChar: 395 1097 8 0 6 -1 4 -&<rEDIKBKL -BDFChar: 396 1098 6 0 4 0 4 -^d*-8GQ7^D -BDFChar: 397 1099 8 0 5 0 4 -KS8u^oDejk -BDFChar: 398 1100 5 0 3 0 4 -J:R-Nn,NFg -BDFChar: 399 1101 5 0 3 0 4 -i"0i=huE`W -BDFChar: 400 1102 8 0 6 0 4 -S>,#;S,`Nh -BDFChar: 401 1103 5 0 3 0 4 -n;qTcO8o7\ -BDFChar: 402 1104 5 0 4 0 6 -+96A:pjdSh -BDFChar: 403 1105 5 0 4 0 6 -:]PHjpjdSh -BDFChar: 404 1024 6 1 4 0 8 -5QL;(JFJ)>n,NFg -BDFChar: 405 1025 6 1 4 0 7 -T^[J^n:6&Y +f\#t<0OVZr +BDFChar: 390 1092 9 0 7 -2 6 +(`7_VgY7/o(]XO9 +BDFChar: 391 1093 5 0 4 0 4 +f_BF\fDkmO +BDFChar: 392 1094 7 0 6 -1 4 +bfn;TrWW?& +BDFChar: 393 1095 6 0 5 0 4 +bfkGC$ig8- +BDFChar: 394 1096 9 0 7 0 4 +gY:K;rr<$! +BDFChar: 395 1097 9 0 8 -1 4 +gAot.gAot.s*t-# +BDFChar: 396 1098 7 0 5 0 4 +i*^eGGQ7^D +BDFChar: 397 1099 9 0 7 0 4 +_o)*#o)Jaj +BDFChar: 398 1100 6 0 4 0 4 +^qfHln,NFg +BDFChar: 399 1101 5 0 4 0 4 +n/-Ben,NFg +BDFChar: 400 1102 9 0 7 0 4 +cJ/6Nc2[hE +BDFChar: 401 1103 5 0 4 0 4 +Gh(a)7CQiI*d +BDFChar: 402 1104 6 0 4 0 6 ++96B5pqV+S +BDFChar: 403 1105 6 0 4 0 6 +:]PIepqV+S +BDFChar: 404 1024 6 0 4 0 8 ++9;2P_"b^\p](9o +BDFChar: 405 1025 6 0 4 0 7 +;#%iApqX]? BDFChar: 406 1029 6 0 4 0 6 G^t<`#RKo" BDFChar: 407 1030 4 0 2 0 6 @@ -11032,15 +11032,15 @@ T]"b$TV)8b BDFChar: 411 1118 5 0 4 -2 7 :`oaoOAK=-+M[sW BDFChar: 412 1038 6 0 4 0 8 -:`tRM:f&8W^]4?7 +:a"ECpi%op^]4?7 BDFChar: 413 1111 3 0 2 0 6 TE%5B5X7R7 BDFChar: 414 1110 3 0 0 0 6 J,k+MJ:N.M -BDFChar: 415 1169 4 1 3 0 4 -i.-?.J,fQL -BDFChar: 416 1168 5 1 4 0 6 -n:6%>J:N.M +BDFChar: 415 1169 5 0 3 0 4 +nA)iT^]4?7 +BDFChar: 416 1168 6 0 4 0 6 +pqX\\^qd_c BDFChar: 417 1170 5 0 4 0 6 GX1a`5X7R7 BDFChar: 418 1171 4 1 3 0 4 diff --git a/fonts/tahomabd.ttf b/fonts/tahomabd.ttf index afa2d39..82ce9fa 100644 Binary files a/fonts/tahomabd.ttf and b/fonts/tahomabd.ttf differ

1 0

Huw Davies : wineps: Move the installed font list to a standard list.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 4ff9b7f11a92091c0485504f1a750e9b37844064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ff9b7f11a92091c0485504f1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 12:36:14 2012 +0100 wineps: Move the installed font list to a standard list. --- dlls/wineps.drv/init.c | 3 ++- dlls/wineps.drv/ppd.c | 32 ++++++++++++-------------------- dlls/wineps.drv/psdrv.h | 7 ++++--- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 0c06ecb..affbcbc 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -773,7 +773,8 @@ PRINTERINFO *PSDRV_FindPrinterInfo(LPCWSTR name) pi->Fonts = NULL; - for(font = pi->ppd->InstalledFonts; font; font = font->next) { + LIST_FOR_EACH_ENTRY( font, &pi->ppd->InstalledFonts, FONTNAME, entry ) + { afm = PSDRV_FindAFMinList(PSDRV_AFMFontList, font->Name); if(!afm) { TRACE( "Couldn't find AFM file for installed printer font '%s' - " diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index c2c422d..3f2c473 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -631,7 +631,9 @@ PPD *PSDRV_ParsePPD(char *fname) } ppd->ColorDevice = CD_NotSpecified; - list_init(&ppd->PageSizes); + + list_init( &ppd->InstalledFonts ); + list_init( &ppd->PageSizes ); /* * The Windows PostScript drivers create the following "virtual bin" for @@ -678,23 +680,13 @@ PPD *PSDRV_ParsePPD(char *fname) WARN("failed to parse DefaultResolution %s\n", debugstr_a(tuple.value)); } - else if(!strcmp("*Font", tuple.key)) { - FONTNAME *fn; - - for(fn = ppd->InstalledFonts; fn && fn->next; fn = fn->next) - ; - if(!fn) { - ppd->InstalledFonts = HeapAlloc(PSDRV_Heap, - HEAP_ZERO_MEMORY, sizeof(*fn)); - fn = ppd->InstalledFonts; - } else { - fn->next = HeapAlloc(PSDRV_Heap, - HEAP_ZERO_MEMORY, sizeof(*fn)); - fn = fn->next; - } - fn->Name = tuple.option; - tuple.option = NULL; - } + else if(!strcmp("*Font", tuple.key)) + { + FONTNAME *fn = HeapAlloc( PSDRV_Heap, 0, sizeof(*fn) ); + fn->Name = tuple.option; + tuple.option = NULL; + list_add_tail( &ppd->InstalledFonts, &fn->entry ); + } else if(!strcmp("*DefaultFont", tuple.key)) { ppd->DefaultFont = tuple.value; @@ -985,8 +977,8 @@ PPD *PSDRV_ParsePPD(char *fname) OPTION *option; OPTIONENTRY *optionEntry; - for(fn = ppd->InstalledFonts; fn; fn = fn->next) - TRACE("'%s'\n", fn->Name); + LIST_FOR_EACH_ENTRY( fn, &ppd->InstalledFonts, FONTNAME, entry ) + TRACE("'%s'\n", fn->Name); LIST_FOR_EACH_ENTRY(page, &ppd->PageSizes, PAGESIZE, entry) { TRACE("'%s' aka '%s' (%d) invoked by '%s'\n", page->Name, diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index df86c70..a4ac759 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -118,9 +118,10 @@ typedef struct _tagFONTFAMILY { extern FONTFAMILY *PSDRV_AFMFontList DECLSPEC_HIDDEN; extern const AFM *const PSDRV_BuiltinAFMs[] DECLSPEC_HIDDEN; /* last element is NULL */ -typedef struct _tagFONTNAME { +typedef struct +{ + struct list entry; char *Name; - struct _tagFONTNAME *next; } FONTNAME; typedef struct { @@ -213,7 +214,7 @@ typedef struct { char *JCLToPSInterpreter; char *JCLEnd; char *DefaultFont; - FONTNAME *InstalledFonts; /* ptr to a list of FontNames */ + struct list InstalledFonts; struct list PageSizes; PAGESIZE *DefaultPageSize; OPTION *InstalledOptions;

1 0

Huw Davies : wineps: Move the constraints list to a standard list.
by Alexandre Julliard 11 Apr '12

11 Apr '12

Module: wine Branch: master Commit: 4dfef2ef2d1743e3f47d59f4ed83c1b41d3d1db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dfef2ef2d1743e3f47d59f4e… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 11 12:36:15 2012 +0100 wineps: Move the constraints list to a standard list. --- dlls/wineps.drv/ppd.c | 19 ++++++++----------- dlls/wineps.drv/psdrv.h | 7 ++++--- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/wineps.drv/ppd.c b/dlls/wineps.drv/ppd.c index 3f2c473..37c6094 100644 --- a/dlls/wineps.drv/ppd.c +++ b/dlls/wineps.drv/ppd.c @@ -634,6 +634,7 @@ PPD *PSDRV_ParsePPD(char *fname) list_init( &ppd->InstalledFonts ); list_init( &ppd->PageSizes ); + list_init( &ppd->Constraints ); /* * The Windows PostScript drivers create the following "virtual bin" for @@ -812,23 +813,19 @@ PPD *PSDRV_ParsePPD(char *fname) ppd->LandscapeOrientation); } - else if(!strcmp("*UIConstraints", tuple.key)) { + else if(!strcmp("*UIConstraints", tuple.key)) + { char *start; - CONSTRAINT *con, **insert = &ppd->Constraints; - - while(*insert) - insert = &((*insert)->next); - - con = *insert = HeapAlloc( PSDRV_Heap, HEAP_ZERO_MEMORY, - sizeof(*con) ); + CONSTRAINT *con = HeapAlloc( PSDRV_Heap, 0, sizeof(*con) ); start = tuple.value; - con->Feature1 = PSDRV_PPDGetWord(start, &start); con->Value1 = PSDRV_PPDGetWord(start, &start); con->Feature2 = PSDRV_PPDGetWord(start, &start); con->Value2 = PSDRV_PPDGetWord(start, &start); - } + + list_add_tail( &ppd->Constraints, &con->entry ); + } else if (!strcmp("*InputSlot", tuple.key)) { @@ -992,7 +989,7 @@ PPD *PSDRV_ParsePPD(char *fname) page->PaperDimension->x, page->PaperDimension->y); } - for(con = ppd->Constraints; con; con = con->next) + LIST_FOR_EACH_ENTRY( con, &ppd->Constraints, CONSTRAINT, entry ) TRACE("CONSTRAINTS@ %s %s %s %s\n", con->Feature1, con->Value1, con->Feature2, con->Value2); diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h index a4ac759..a240f4f 100644 --- a/dlls/wineps.drv/psdrv.h +++ b/dlls/wineps.drv/psdrv.h @@ -168,12 +168,13 @@ typedef struct _tagOPTION { /* Treat bool as a special case of pickone */ struct _tagOPTION *next; } OPTION; -typedef struct _tagCONSTRAINT { +typedef struct +{ + struct list entry; char *Feature1; char *Value1; char *Feature2; char *Value2; - struct _tagCONSTRAINT *next; } CONSTRAINT; typedef struct _tagINPUTSLOT { @@ -218,7 +219,7 @@ typedef struct { struct list PageSizes; PAGESIZE *DefaultPageSize; OPTION *InstalledOptions; - CONSTRAINT *Constraints; + struct list Constraints; INPUTSLOT *InputSlots; RASTERIZEROPTION TTRasterizer; DUPLEX *Duplexes;

1 0

Marcus Meissner : winealsa.drv: Fixed buffer to RegEnumKeyExW.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 272535b948e8af27e2d291edeae6c4eb7bd988e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272535b948e8af27e2d291ede… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Mon Apr 9 23:52:37 2012 +0200 winealsa.drv: Fixed buffer to RegEnumKeyExW. --- dlls/winealsa.drv/mmdevdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 66e8baf..e3c1d15 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -710,7 +710,7 @@ static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EData DWORD size, type; GUID reg_guid; - key_name_size = sizeof(key_name); + key_name_size = sizeof(key_name)/sizeof(WCHAR); if(RegEnumKeyExW(devices_key, i, key_name, &key_name_size, NULL, NULL, NULL, NULL) != ERROR_SUCCESS) break;

1 0

Jacek Caban : mshtml: Added better IHTMLWindow2::get_opener stub.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 8e71096fd1ec7a5909a791770a67ac092de6d4e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e71096fd1ec7a5909a791770… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 10 12:53:03 2012 +0200 mshtml: Added better IHTMLWindow2::get_opener stub. --- dlls/mshtml/htmlwindow.c | 7 +++++-- dlls/mshtml/tests/dom.c | 6 ++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 294f551..4242a77 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -711,8 +711,11 @@ static HRESULT WINAPI HTMLWindow2_put_opener(IHTMLWindow2 *iface, VARIANT v) static HRESULT WINAPI HTMLWindow2_get_opener(IHTMLWindow2 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + FIXME("(%p)->(%p) returning empty\n", This, p); + + V_VT(p) = VT_EMPTY; + return S_OK; } static HRESULT WINAPI HTMLWindow2_get_navigator(IHTMLWindow2 *iface, IOmNavigator **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 267ac9e..b951724 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4483,6 +4483,7 @@ static void test_window(IHTMLDocument2 *doc) IHTMLDocument2 *doc2 = NULL; IDispatch *disp; IUnknown *unk; + VARIANT v; BSTR str; HRESULT hres; @@ -4545,6 +4546,11 @@ static void test_window(IHTMLDocument2 *doc) !strcmp_wa(str, "[object Window]") /* win7 ie9 */, "toString returned %s\n", wine_dbgstr_w(str)); SysFreeString(str); + V_VT(&v) = VT_ERROR; + hres = IHTMLWindow2_get_opener(window, &v); + ok(hres == S_OK, "get_opener failed: %08x\n", hres); + ok(V_VT(&v) == VT_EMPTY, "V_VT(opener) = %d\n", V_VT(&v)); + test_window_name(window, NULL); set_window_name(window, "test"); test_window_length(window, 0);

1 0