December 2010 - Wine-commits

Huw Davies : fonts: Fix the metrics of the extended integral and brace glyphs.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 156f611ba8b24ed03c17c7c860d3accea1b31e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=156f611ba8b24ed03c17c7c86… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Dec 15 10:21:50 2010 +0000 fonts: Fix the metrics of the extended integral and brace glyphs. --- fonts/symbol.sfd | 216 +++++++++++++++++++++++++++--------------------------- fonts/symbol.ttf | Bin 26040 -> 26040 bytes 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/fonts/symbol.sfd b/fonts/symbol.sfd index 0010a65..bf34606 100644 --- a/fonts/symbol.sfd +++ b/fonts/symbol.sfd @@ -83,7 +83,7 @@ BeginChars: 257 192 StartChar: .notdef Encoding: 255 711 0 -AltUni2: 000001.ffffffff.0 000002.ffffffff.0 000003.ffffffff.0 000004.ffffffff.0 000005.ffffffff.0 000006.ffffffff.0 000007.ffffffff.0 00000a.ffffffff.0 00000b.ffffffff.0 00000c.ffffffff.0 00000e.ffffffff.0 00000f.ffffffff.0 000010.ffffffff.0 000011.ffffffff.0 000012.ffffffff.0 000013.ffffffff.0 000014.ffffffff.0 000015.ffffffff.0 000016.ffffffff.0 000017.ffffffff.0 000018.ffffffff.0 000019.ffffffff.0 00001a.ffffffff.0 00001b.ffffffff.0 00001c.ffffffff.0 00001e.ffffffff.0 00001f.ffffffff.0 00007f.ffffffff.0 0000c4.ffffffff.0 0000c5.ffffffff.0 0000c7.ffffffff.0 0000c9.ffffffff.0 0000d1.ffffffff.0 0000d6.ffffffff.0 0000dc.ffffffff.0 0000e1.ffffffff.0 0000e0.ffffffff.0 0000e2.ffffffff.0 0000e4.ffffffff.0 0000e3.ffffffff.0 0000e5.ffffffff.0 0000e7.ffffffff.0 0000e9.ffffffff.0 0000e8.ffffffff.0 0000ea.ffffffff.0 0000eb.ffffffff.0 0000ed.ffffffff.0 0000ec.ffffffff.0 0000ee.ffffffff.0 0000ef.ffffffff.0 0000f1.ffffffff.0 0000f3.ffffffff.0 0000f2.ffffffff.0 0000f4.ffffffff.0 0000f6.ffffffff.0 0000f5.ffffffff.0 0000fa.ffffffff.0 0000f9.ffffffff.0 0000fb.ffffffff.0 0000fc.ffffffff.0 002020.ffffffff.0 +AltUni2: 002020.ffffffff.0 0000fc.ffffffff.0 0000fb.ffffffff.0 0000f9.ffffffff.0 0000fa.ffffffff.0 0000f5.ffffffff.0 0000f6.ffffffff.0 0000f4.ffffffff.0 0000f2.ffffffff.0 0000f3.ffffffff.0 0000f1.ffffffff.0 0000ef.ffffffff.0 0000ee.ffffffff.0 0000ec.ffffffff.0 0000ed.ffffffff.0 0000eb.ffffffff.0 0000ea.ffffffff.0 0000e8.ffffffff.0 0000e9.ffffffff.0 0000e7.ffffffff.0 0000e5.ffffffff.0 0000e3.ffffffff.0 0000e4.ffffffff.0 0000e2.ffffffff.0 0000e0.ffffffff.0 0000e1.ffffffff.0 0000dc.ffffffff.0 0000d6.ffffffff.0 0000d1.ffffffff.0 0000c9.ffffffff.0 0000c7.ffffffff.0 0000c5.ffffffff.0 0000c4.ffffffff.0 00007f.ffffffff.0 00001f.ffffffff.0 00001e.ffffffff.0 00001c.ffffffff.0 00001b.ffffffff.0 00001a.ffffffff.0 000019.ffffffff.0 000018.ffffffff.0 000017.ffffffff.0 000016.ffffffff.0 000015.ffffffff.0 000014.ffffffff.0 000013.ffffffff.0 000012.ffffffff.0 000011.ffffffff.0 000010.ffffffff.0 00000f.ffffffff.0 00000e.ffffffff.0 00000c.ffffffff.0 00000b.ffffffff.0 00000a.ffffffff.0 000007.ffffffff.0 000006.ffffffff.0 000005.ffffffff.0 000004.ffffffff.0 000003.ffffffff.0 000002.ffffffff.0 000001.ffffffff.0 Width: 1229 Flags: W LayerCount: 2 @@ -104,7 +104,7 @@ EndChar StartChar: uni001D Encoding: 29 29 1 -AltUni2: 000000.ffffffff.0 000008.ffffffff.0 00000d.ffffffff.0 +AltUni2: 00000d.ffffffff.0 000008.ffffffff.0 000000.ffffffff.0 Width: 0 Flags: W LayerCount: 2 @@ -5564,78 +5564,78 @@ EndChar StartChar: bracelefttp Encoding: 236 207 173 -Width: 2048 -Flags: W +Width: 1012 +Flags: HW LayerCount: 2 Fore SplineSet -637 -162 m 1,0,-1 - 532 -162 l 1,1,-1 - 532 1290 l 1,2,3 - 549 1883 549 1883 984 1884 c 1,4,-1 - 1038 1836 l 1,5,6 - 621 1835 621 1835 637 1302 c 1,7,-1 - 637 -162 l 1,0,-1 +525 -162 m 1,0,-1 + 420 -162 l 1,1,-1 + 420 1290 l 1,2,3 + 437 1883 437 1883 872 1884 c 1,4,-1 + 926 1836 l 1,5,6 + 509 1835 509 1835 525 1302 c 1,7,-1 + 525 -162 l 1,0,-1 EndSplineSet EndChar StartChar: braceleftmid Encoding: 237 204 174 Width: 1012 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -469 1444 m 1,0,1 - 460 1265 460 1265 420 1159.5 c 128,-1,2 - 380 1054 380 1054 313 989 c 128,-1,3 - 246 924 246 924 44 858 c 1,4,5 - 246 768 246 768 312 693.5 c 128,-1,6 - 378 619 378 619 423.5 506.5 c 128,-1,7 - 469 394 469 394 469 268 c 2,8,-1 - 469 -162 l 1,9,-1 - 364 -162 l 1,10,-1 - 364 250 l 1,11,12 - 366 463 366 463 286.5 596 c 128,-1,13 - 207 729 207 729 0 827 c 1,14,-1 - 0 899 l 1,15,16 - 206 949 206 949 288 1080.5 c 128,-1,17 - 370 1212 370 1212 364 1476 c 1,18,-1 - 364 1885 l 1,19,-1 - 469 1885 l 1,20,-1 - 469 1444 l 1,0,1 +525 1444 m 1,0,1 + 516 1265 516 1265 476 1159.5 c 128,-1,2 + 436 1054 436 1054 369 989 c 128,-1,3 + 302 924 302 924 100 858 c 1,4,5 + 302 768 302 768 368 693.5 c 128,-1,6 + 434 619 434 619 479.5 506.5 c 128,-1,7 + 525 394 525 394 525 268 c 2,8,-1 + 525 -162 l 1,9,-1 + 420 -162 l 1,10,-1 + 420 250 l 1,11,12 + 422 463 422 463 342.5 596 c 128,-1,13 + 263 729 263 729 56 827 c 1,14,-1 + 56 899 l 1,15,16 + 262 949 262 949 344 1080.5 c 128,-1,17 + 426 1212 426 1212 420 1476 c 1,18,-1 + 420 1885 l 1,19,-1 + 525 1885 l 1,20,-1 + 525 1444 l 1,0,1 EndSplineSet EndChar StartChar: braceleftbt Encoding: 238 211 175 -Width: 2048 -Flags: W +Width: 1012 +Flags: HW LayerCount: 2 Fore SplineSet -637 420 m 1,0,1 - 621 -113 621 -113 1038 -113 c 1,2,-1 - 984 -162 l 1,3,4 - 549 -160 549 -160 532 432 c 1,5,-1 - 532 1884 l 1,6,-1 - 637 1884 l 1,7,-1 - 637 420 l 1,0,1 +525 420 m 1,0,1 + 509 -113 509 -113 926 -113 c 1,2,-1 + 872 -162 l 1,3,4 + 437 -160 437 -160 420 432 c 1,5,-1 + 420 1884 l 1,6,-1 + 525 1884 l 1,7,-1 + 525 420 l 1,0,1 EndSplineSet EndChar StartChar: braceex Encoding: 239 212 176 -Width: 2048 -Flags: W +Width: 1012 +Flags: HW LayerCount: 2 Fore SplineSet -101 1899 m 1,0,-1 - 101 -161 l 1,1,-1 - 2 -161 l 1,2,-1 - 2 1899 l 1,3,-1 - 101 1899 l 1,0,-1 +519 1899 m 1,0,-1 + 519 -161 l 1,1,-1 + 420 -161 l 1,2,-1 + 420 1899 l 1,3,-1 + 519 1899 l 1,0,-1 EndSplineSet EndChar @@ -5733,44 +5733,44 @@ EndChar StartChar: integraltp Encoding: 243 219 180 Width: 1405 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -672 1804 m 1,0,1 - 584 1844 584 1844 502 1794 c 1,2,3 - 357 1725 357 1725 261.5 1503 c 128,-1,4 - 166 1281 166 1281 140 850 c 1,5,-1 - 140 -162 l 1,6,-1 - 0 -162 l 1,7,-1 - 0 679 l 1,8,9 - 13 1158 13 1158 110 1411.5 c 128,-1,10 - 207 1665 207 1665 341 1777 c 128,-1,11 - 475 1889 475 1889 602 1884 c 1,12,13 - 676 1885 676 1885 729 1830 c 128,-1,14 - 782 1775 782 1775 782 1692 c 1,15,16 - 783 1680 783 1680 781 1669 c 0,17,18 - 774 1619 774 1619 733 1588 c 1,19,20 - 693 1556 693 1556 642.5 1562 c 128,-1,21 - 592 1568 592 1568 562 1608 c 1,22,23 - 531 1647 531 1647 538 1697 c 128,-1,24 - 545 1747 545 1747 586 1779 c 0,25,26 - 624 1809 624 1809 672 1804 c 1,0,1 +1383 1804 m 1,0,1 + 1295 1844 1295 1844 1213 1794 c 1,2,3 + 1068 1725 1068 1725 972.5 1503 c 128,-1,4 + 877 1281 877 1281 851 850 c 1,5,-1 + 851 -162 l 1,6,-1 + 711 -162 l 1,7,-1 + 711 679 l 1,8,9 + 724 1158 724 1158 821 1411.5 c 128,-1,10 + 918 1665 918 1665 1052 1777 c 128,-1,11 + 1186 1889 1186 1889 1313 1884 c 1,12,13 + 1387 1885 1387 1885 1440 1830 c 128,-1,14 + 1493 1775 1493 1775 1493 1692 c 1,15,16 + 1494 1680 1494 1680 1492 1669 c 0,17,18 + 1485 1619 1485 1619 1444 1588 c 1,19,20 + 1404 1556 1404 1556 1353.5 1562 c 128,-1,21 + 1303 1568 1303 1568 1273 1608 c 1,22,23 + 1242 1647 1242 1647 1249 1697 c 128,-1,24 + 1256 1747 1256 1747 1297 1779 c 0,25,26 + 1335 1809 1335 1809 1383 1804 c 1,0,1 EndSplineSet EndChar StartChar: integralex Encoding: 244 217 181 Width: 1405 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -140 1885 m 1,0,-1 - 140 -162 l 1,1,-1 - 0 -162 l 1,2,-1 - 0 1886 l 1,3,-1 - 140 1885 l 1,0,-1 +851 1885 m 1,0,-1 + 851 -162 l 1,1,-1 + 711 -162 l 1,2,-1 + 711 1886 l 1,3,-1 + 851 1885 l 1,0,-1 EndSplineSet EndChar @@ -5784,7 +5784,7 @@ SplineSet 178 -82 m 1,0,1 266 -122 266 -122 348 -73 c 1,2,3 494 -3 494 -3 589.5 219 c 128,-1,4 - 685 441 685 441 711 872 c 1,5,-1 + 685 441 685 441 711 872 c 5,5,-1 711 1884 l 1,6,-1 851 1884 l 1,7,-1 851 1043 l 1,8,9 @@ -5904,62 +5904,62 @@ EndChar StartChar: bracerighttp Encoding: 252 184 189 Width: 1012 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -427 1302 m 1,0,1 - 443 1835 443 1835 26 1836 c 1,2,-1 - 80 1884 l 1,3,4 - 515 1883 515 1883 532 1290 c 1,5,-1 - 532 -162 l 1,6,-1 - 427 -162 l 1,7,-1 - 427 1302 l 1,0,1 +420 1302 m 1,0,1 + 436 1835 436 1835 19 1836 c 1,2,-1 + 73 1884 l 1,3,4 + 508 1883 508 1883 525 1290 c 1,5,-1 + 525 -162 l 1,6,-1 + 420 -162 l 1,7,-1 + 420 1302 l 1,0,1 EndSplineSet EndChar StartChar: bracerightmid Encoding: 253 733 190 Width: 1012 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -427 1884 m 1,0,-1 - 532 1884 l 1,1,-1 - 532 1475 l 1,2,3 - 527 1211 527 1211 608.5 1079.5 c 128,-1,4 - 690 948 690 948 896 898 c 1,5,-1 - 896 826 l 1,6,7 - 690 728 690 728 610 595 c 128,-1,8 - 530 462 530 462 532 249 c 1,9,-1 - 532 -163 l 1,10,-1 - 427 -163 l 1,11,-1 - 427 267 l 2,12,13 - 427 393 427 393 473 505.5 c 128,-1,14 - 519 618 519 618 584.5 692.5 c 128,-1,15 - 650 767 650 767 852 857 c 1,16,17 - 650 923 650 923 583.5 988 c 128,-1,18 - 517 1053 517 1053 476.5 1158.5 c 128,-1,19 - 436 1264 436 1264 427 1443 c 1,20,-1 - 427 1884 l 1,0,-1 +420 1884 m 1,0,-1 + 525 1884 l 1,1,-1 + 525 1475 l 1,2,3 + 520 1211 520 1211 601.5 1079.5 c 128,-1,4 + 683 948 683 948 889 898 c 1,5,-1 + 889 826 l 1,6,7 + 683 728 683 728 603 595 c 128,-1,8 + 523 462 523 462 525 249 c 1,9,-1 + 525 -163 l 1,10,-1 + 420 -163 l 1,11,-1 + 420 267 l 2,12,13 + 420 393 420 393 466 505.5 c 128,-1,14 + 512 618 512 618 577.5 692.5 c 128,-1,15 + 643 767 643 767 845 857 c 1,16,17 + 643 923 643 923 576.5 988 c 128,-1,18 + 510 1053 510 1053 469.5 1158.5 c 128,-1,19 + 429 1264 429 1264 420 1443 c 1,20,-1 + 420 1884 l 1,0,-1 EndSplineSet EndChar StartChar: bracerightbt Encoding: 254 731 191 Width: 1012 -Flags: W +Flags: HW LayerCount: 2 Fore SplineSet -427 1884 m 1,0,-1 - 532 1884 l 1,1,-1 - 532 432 l 1,2,3 - 515 -160 515 -160 80 -162 c 1,4,-1 - 26 -113 l 1,5,6 - 443 -113 443 -113 427 420 c 1,7,-1 - 427 1884 l 1,0,-1 +420 1884 m 1,0,-1 + 525 1884 l 1,1,-1 + 525 432 l 1,2,3 + 508 -160 508 -160 73 -162 c 1,4,-1 + 19 -113 l 1,5,6 + 436 -113 436 -113 420 420 c 1,7,-1 + 420 1884 l 1,0,-1 EndSplineSet EndChar EndChars diff --git a/fonts/symbol.ttf b/fonts/symbol.ttf index f331787..b0a3fc1 100644 Binary files a/fonts/symbol.ttf and b/fonts/symbol.ttf differ

1 0

André Hentschel : gphoto2.ds: Fix German translation.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 05061e26e765f1cbc595f33ab28ac058a0fcdea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05061e26e765f1cbc595f33ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 14 19:45:58 2010 +0100 gphoto2.ds: Fix German translation. --- dlls/gphoto2.ds/gphoto2_De.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_De.rc b/dlls/gphoto2.ds/gphoto2_De.rc index 77ea6fc..55cf692 100644 --- a/dlls/gphoto2.ds/gphoto2_De.rc +++ b/dlls/gphoto2.ds/gphoto2_De.rc @@ -41,10 +41,10 @@ END IDD_DIALOG1 DIALOG 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND -CAPTION "Übertragung" +CAPTION "Übertrage" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Übertrage... Bitte Warten",IDC_STATIC,5,19,176,8, SS_CENTER + LTEXT "Übertrage... Bitte warten",IDC_STATIC,5,19,176,8, SS_CENTER END IDD_CONNECTING DIALOG 0, 0, 280, 116 @@ -53,6 +53,6 @@ CAPTION "Verbinde mit Kamera" FONT 8, "MS Sans Serif" BEGIN CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 - LTEXT "Verbinde mit Kamera... Bitte Warten",IDC_STATIC,128,58, + LTEXT "Verbinde mit Kamera... Bitte warten",IDC_STATIC,128,58, 116,8 END

1 0

Jacek Caban : mshtml: Added OnUIActivation implementation.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 14f2d1b19ce1d8ba96782ef2f65b791a04758fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f2d1b19ce1d8ba96782ef2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 15 00:42:11 2010 +0100 mshtml: Added OnUIActivation implementation. --- dlls/mshtml/pluginhost.c | 37 ++++++++++++++++++++++++++++++++-- dlls/mshtml/pluginhost.h | 2 + dlls/mshtml/tests/activex.c | 45 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 79 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 8f280c5..9ab0983 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -651,8 +651,36 @@ static HRESULT WINAPI PHInPlaceSite_OnInPlaceActivate(IOleInPlaceSiteEx *iface) static HRESULT WINAPI PHInPlaceSite_OnUIActivate(IOleInPlaceSiteEx *iface) { PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + DISPPARAMS args = {NULL, NULL, 0, 0}; + IDispatch *disp; + ULONG err = 0; + VARIANT res; + HRESULT hres; + + TRACE("(%p)\n", This); + + if(!This->plugin_unk) { + ERR("No plugin object\n"); + return E_UNEXPECTED; + } + + This->ui_active = TRUE; + + hres = IUnknown_QueryInterface(This->plugin_unk, &IID_IDispatch, (void**)&disp); + if(FAILED(hres)) { + FIXME("Could not get IDispatch iface: %08x\n", hres); + return hres; + } + + V_VT(&res) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_ENABLED, &IID_NULL, 0/*FIXME*/, DISPATCH_PROPERTYGET, &args, &res, NULL, &err); + IDispatch_Release(disp); + if(SUCCEEDED(hres)) { + FIXME("Got enabled %s\n", debugstr_variant(&res)); + VariantClear(&res); + } + + return S_OK; } static HRESULT WINAPI PHInPlaceSite_GetWindowContext(IOleInPlaceSiteEx *iface, @@ -1024,8 +1052,11 @@ void detach_plugin_host(PluginHost *host) if(!host->doc) return; - if(host->ip_object) + if(host->ip_object) { + if(host->ui_active) + IOleInPlaceObject_UIDeactivate(host->ip_object); IOleInPlaceObject_InPlaceDeactivate(host->ip_object); + } if(host->plugin_unk) { IOleObject *ole_obj; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index c547946..65ccb60 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -33,8 +33,10 @@ typedef struct { IUnknown *plugin_unk; IOleInPlaceObject *ip_object; CLSID clsid; + HWND hwnd; RECT rect; + BOOL ui_active; HTMLDocumentNode *doc; struct list entry; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index aab13d5..a89d7e7 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -63,6 +63,8 @@ DEFINE_EXPECT(QuickActivate); DEFINE_EXPECT(IPersistPropertyBag_InitNew); DEFINE_EXPECT(IPersistPropertyBag_Load); DEFINE_EXPECT(Invoke_READYSTATE); +DEFINE_EXPECT(Invoke_ENABLED); +DEFINE_EXPECT(Invoke_VALID); DEFINE_EXPECT(DoVerb); DEFINE_EXPECT(SetExtent); DEFINE_EXPECT(GetExtent); @@ -72,6 +74,7 @@ DEFINE_EXPECT(Close); DEFINE_EXPECT(InPlaceObject_GetWindow); DEFINE_EXPECT(SetObjectRects); DEFINE_EXPECT(InPlaceDeactivate); +DEFINE_EXPECT(UIDeactivate); static HWND container_hwnd, plugin_hwnd; @@ -572,6 +575,18 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF V_VT(pVarResult) = VT_I4; V_I4(pVarResult) = plugin_readystate; return S_OK; + case DISPID_ENABLED: + CHECK_EXPECT2(Invoke_ENABLED); + ok(wFlags == DISPATCH_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(!pDispParams->cArgs, "pDispParams->cArgs = %d\n", pDispParams->cArgs); + ok(!pDispParams->rgvarg, "pDispParams->rgvarg != NULL\n"); + return DISP_E_MEMBERNOTFOUND; + case DISPID_VALID: + CHECK_EXPECT(Invoke_VALID); + ok(wFlags == DISPATCH_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(!pDispParams->cArgs, "pDispParams->cArgs = %d\n", pDispParams->cArgs); + ok(!pDispParams->rgvarg, "pDispParams->rgvarg != NULL\n"); + return DISP_E_MEMBERNOTFOUND; default: ok(0, "unexpected call %d\n", dispIdMember); } @@ -1003,8 +1018,8 @@ static HRESULT WINAPI OleInPlaceObject_InPlaceDeactivate(IOleInPlaceObjectWindow static HRESULT WINAPI OleInPlaceObject_UIDeactivate(IOleInPlaceObjectWindowless *iface) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT2(UIDeactivate); + return S_OK; } static HRESULT WINAPI OleInPlaceObject_SetObjectRects(IOleInPlaceObjectWindowless *iface, @@ -1149,6 +1164,22 @@ static const IClassFactoryVtbl ClassFactoryVtbl = { static IClassFactory activex_cf = { &ClassFactoryVtbl }; +static void test_ui_activate(void) +{ + IOleInPlaceSite *ip_site; + HRESULT hres; + + hres = IOleClientSite_QueryInterface(client_site, &IID_IOleInPlaceSite, (void**)&ip_site); + ok(hres == S_OK, "Could not get IOleInPlaceSite iface: %08x\n", hres); + + SET_EXPECT(Invoke_ENABLED); + hres = IOleInPlaceSite_OnUIActivate(ip_site); + ok(hres == S_OK, "OnUIActivate failed: %08x\n", hres); + CHECK_CALLED(Invoke_ENABLED); + + IOleInPlaceSite_Release(ip_site); +} + static HRESULT cs_qi(REFIID,void **); static IOleDocumentView *view; @@ -1747,10 +1778,20 @@ static void test_object_ax(void) CHECK_CALLED(InPlaceObject_GetWindow); CHECK_CALLED(SetObjectRects); + test_ui_activate(); + + SET_EXPECT(UIDeactivate); + SET_EXPECT(Invoke_ENABLED); + SET_EXPECT(Invoke_VALID); SET_EXPECT(InPlaceDeactivate); SET_EXPECT(Close); SET_EXPECT(SetClientSite_NULL); release_doc(doc); + CHECK_CALLED(UIDeactivate); + todo_wine + CHECK_CALLED(Invoke_ENABLED); + todo_wine + CHECK_CALLED(Invoke_VALID); CHECK_CALLED(InPlaceDeactivate); CHECK_CALLED(Close); CHECK_CALLED(SetClientSite_NULL);

1 0

Jacek Caban : mshtml: Added IOleContainer stub implementation.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: dc25bca4edb303f7f903f51773871709e1c704e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc25bca4edb303f7f903f5177… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 15 00:42:32 2010 +0100 mshtml: Added IOleContainer stub implementation. --- dlls/mshtml/htmldoc.c | 3 ++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/oleobj.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 3 ++ 4 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7cfa273..3c4b03c 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1818,6 +1818,9 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { TRACE("(%p)->(IID_IObjectWithSite %p)\n", This, ppv); *ppv = OBJSITE(This); + }else if(IsEqualGUID(&IID_IOleContainer, riid)) { + TRACE("(%p)->(IID_IOleContainer %p)\n", This, ppv); + *ppv = &This->IOleContainer_iface; }else { return FALSE; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 269962f..833caf0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -365,6 +365,7 @@ struct HTMLDocument { const IDispatchExVtbl *lpIDispatchExVtbl; const ISupportErrorInfoVtbl *lpSupportErrorInfoVtbl; const IObjectWithSiteVtbl *lpObjectWithSiteVtbl; + IOleContainer IOleContainer_iface; IUnknown *unk_impl; IDispatchEx *dispex; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 419d9aa..173a6cf 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -797,6 +797,60 @@ static const IObjectWithSiteVtbl ObjectWithSiteVtbl = { ObjectWithSite_GetSite }; +static inline HTMLDocument *impl_from_IOleContainer(IOleContainer *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IOleContainer_iface); +} + +static HRESULT WINAPI OleContainer_QueryInterface(IOleContainer *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = impl_from_IOleContainer(iface); + return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppv); +} + +static ULONG WINAPI OleContainer_AddRef(IOleContainer *iface) +{ + HTMLDocument *This = impl_from_IOleContainer(iface); + return IHTMLDocument2_AddRef(HTMLDOC(This)); +} + +static ULONG WINAPI OleContainer_Release(IOleContainer *iface) +{ + HTMLDocument *This = impl_from_IOleContainer(iface); + return IHTMLDocument2_Release(HTMLDOC(This)); +} + +static HRESULT WINAPI OleContainer_ParseDisplayName(IOleContainer *iface, IBindCtx *pbc, LPOLESTR pszDisplayName, + ULONG *pchEaten, IMoniker **ppmkOut) +{ + HTMLDocument *This = impl_from_IOleContainer(iface); + FIXME("(%p)->(%p %s %p %p)\n", This, pbc, debugstr_w(pszDisplayName), pchEaten, ppmkOut); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleContainer_EnumObjects(IOleContainer *iface, DWORD grfFlags, IEnumUnknown **ppenum) +{ + HTMLDocument *This = impl_from_IOleContainer(iface); + FIXME("(%p)->(%x %p)\n", This, grfFlags, ppenum); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleContainer_LockContainer(IOleContainer *iface, BOOL fLock) +{ + HTMLDocument *This = impl_from_IOleContainer(iface); + FIXME("(%p)->(%x)\n", This, fLock); + return E_NOTIMPL; +} + +static const IOleContainerVtbl OleContainerVtbl = { + OleContainer_QueryInterface, + OleContainer_AddRef, + OleContainer_Release, + OleContainer_ParseDisplayName, + OleContainer_EnumObjects, + OleContainer_LockContainer +}; + void HTMLDocument_LockContainer(HTMLDocumentObj *This, BOOL fLock) { IOleContainer *container; @@ -819,4 +873,5 @@ void HTMLDocument_OleObj_Init(HTMLDocument *This) This->lpOleDocumentVtbl = &OleDocumentVtbl; This->lpOleControlVtbl = &OleControlVtbl; This->lpObjectWithSiteVtbl = &ObjectWithSiteVtbl; + This->IOleContainer_iface.lpVtbl = &OleContainerVtbl; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e3b932c..19b7d14 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -125,6 +125,7 @@ static const IID * const doc_node_iids[] = { &IID_IDispatchEx, &IID_IConnectionPointContainer, &IID_IInternetHostSecurityManager, + &IID_IOleContainer, NULL }; @@ -137,6 +138,7 @@ static const IID * const doc_obj_iids[] = { &IID_IDispatchEx, &IID_IConnectionPointContainer, &IID_ICustomDoc, + &IID_IOleContainer, NULL }; @@ -267,6 +269,7 @@ static const IID * const window_iids[] = { &IID_IHTMLWindow2, &IID_IHTMLWindow3, &IID_IDispatchEx, + &IID_IServiceProvider, NULL };

1 0

Jacek Caban : mshtml: Added PluginHost::GetContainer implementation.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 94b591cdf226693de946971d76d7273951966fd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94b591cdf226693de946971d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 15 00:42:44 2010 +0100 mshtml: Added PluginHost::GetContainer implementation. --- dlls/mshtml/pluginhost.c | 13 +++++++++++-- dlls/mshtml/tests/activex.c | 27 +++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 9ab0983..f037eca 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -364,8 +364,17 @@ static HRESULT WINAPI PHClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAss static HRESULT WINAPI PHClientSite_GetContainer(IOleClientSite *iface, IOleContainer **ppContainer) { PluginHost *This = impl_from_IOleClientSite(iface); - FIXME("(%p)->(%p)\n", This, ppContainer); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppContainer); + + if(!This->doc) { + ERR("Called on detached object\n"); + return E_UNEXPECTED; + } + + *ppContainer = &This->doc->basedoc.IOleContainer_iface; + IOleContainer_AddRef(*ppContainer); + return S_OK; } static HRESULT WINAPI PHClientSite_ShowObject(IOleClientSite *iface) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index a89d7e7..1036577 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -1164,6 +1164,32 @@ static const IClassFactoryVtbl ClassFactoryVtbl = { static IClassFactory activex_cf = { &ClassFactoryVtbl }; +static void test_container(IHTMLDocument2 *doc_obj) +{ + IHTMLWindow2 *parent_window; + IOleContainer *container; + IHTMLDocument2 *doc; + HRESULT hres; + + container = NULL; + hres = IOleClientSite_GetContainer(client_site, &container); + ok(hres == S_OK, "GetContainer failed: %08x\n", hres); + ok(container != NULL, "container == NULL\n"); + + hres = IHTMLDocument2_get_parentWindow(doc_obj, &parent_window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(parent_window != NULL, "parentWindow == NULL\n"); + + hres = IHTMLWindow2_get_document(parent_window, &doc); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(doc != NULL, "doc == NULL\n"); + ok(iface_cmp((IUnknown*)doc, (IUnknown*)container), "container != doc\n"); + IHTMLDocument2_Release(doc); + + IHTMLWindow2_Release(parent_window); + IOleContainer_Release(container); +} + static void test_ui_activate(void) { IOleInPlaceSite *ip_site; @@ -1779,6 +1805,7 @@ static void test_object_ax(void) CHECK_CALLED(SetObjectRects); test_ui_activate(); + test_container(notif_doc); SET_EXPECT(UIDeactivate); SET_EXPECT(Invoke_ENABLED);

1 0

Jacek Caban : mshtml: Forward PluginHost' s QueryService calls to window object.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 79f400c06234c0ba454f24b0ea7b4ba24a7dfed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f400c06234c0ba454f24b0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 15 00:42:53 2010 +0100 mshtml: Forward PluginHost's QueryService calls to window object. --- dlls/mshtml/pluginhost.c | 10 +++++- dlls/mshtml/tests/activex.c | 68 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index f037eca..1f5ca00 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -1020,8 +1020,14 @@ static HRESULT WINAPI PHServiceProvider_QueryService(IServiceProvider *iface, RE return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); } - FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); - return E_NOINTERFACE; + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + + if(!This->doc || !This->doc->basedoc.window) { + *ppv = NULL; + return E_NOINTERFACE; + } + + return IServiceProvider_QueryService(SERVPROV(This->doc->basedoc.window), guidService, riid, ppv); } static const IServiceProviderVtbl ServiceProviderVtbl = { diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 1036577..f163c6c 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -29,7 +29,10 @@ #include "mshtml.h" #include "docobj.h" #include "hlink.h" +#include "dispex.h" #include "mshtmhst.h" +#include "activscp.h" +#include "objsafe.h" #include "mshtml_test.h" #define DEFINE_EXPECT(func) \ @@ -75,6 +78,7 @@ DEFINE_EXPECT(InPlaceObject_GetWindow); DEFINE_EXPECT(SetObjectRects); DEFINE_EXPECT(InPlaceDeactivate); DEFINE_EXPECT(UIDeactivate); +DEFINE_EXPECT(QueryService_TestActiveX); static HWND container_hwnd, plugin_hwnd; @@ -471,7 +475,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper hres = IOleClientSite_QueryInterface(client_site, &IID_IServiceProvider, (void**)&sp); ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); - hres = IServiceProvider_QueryService(sp, &IID_IBindHost, &SID_SBindHost, (void**)&bind_host2); + hres = IServiceProvider_QueryService(sp, &SID_SBindHost, &IID_IBindHost, (void**)&bind_host2); ok(hres == S_OK, "QueryService(SID_SBindHost) failed: %08x\n", hres); IServiceProvider_Release(sp); @@ -1166,9 +1170,11 @@ static IClassFactory activex_cf = { &ClassFactoryVtbl }; static void test_container(IHTMLDocument2 *doc_obj) { - IHTMLWindow2 *parent_window; + IHTMLWindow2 *parent_window, *html_window; + IServiceProvider *serv_prov; IOleContainer *container; IHTMLDocument2 *doc; + IUnknown *unk; HRESULT hres; container = NULL; @@ -1186,6 +1192,23 @@ static void test_container(IHTMLDocument2 *doc_obj) ok(iface_cmp((IUnknown*)doc, (IUnknown*)container), "container != doc\n"); IHTMLDocument2_Release(doc); + hres = IOleClientSite_QueryInterface(client_site, &IID_IServiceProvider, (void**)&serv_prov); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + + hres = IServiceProvider_QueryService(serv_prov, &IID_IHTMLWindow2, &IID_IHTMLWindow2, (void**)&html_window); + ok(hres == S_OK, "Could not get IHTMLWindow2 service: %08x\n", hres); + todo_wine + ok(!iface_cmp((IUnknown*)html_window, (IUnknown*)parent_window), "html_window != parent_window\n"); + IHTMLWindow2_Release(html_window); + + SET_EXPECT(QueryService_TestActiveX); + hres = IServiceProvider_QueryService(serv_prov, &CLSID_TestActiveX, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "QueryService(CLSID_TestActiveX) failed: %08x\n", hres); + ok(unk == (IUnknown*)&OleObject, "unexpected unk %p\n", unk); + CHECK_CALLED(QueryService_TestActiveX); + + IServiceProvider_Release(serv_prov); + IHTMLWindow2_Release(parent_window); IOleContainer_Release(container); } @@ -1567,6 +1590,45 @@ static const IOleDocumentSiteVtbl DocumentSiteVtbl = { static IOleDocumentSite DocumentSite = { &DocumentSiteVtbl }; +static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, + REFIID riid, void **ppv) +{ + return cs_qi(riid, ppv); +} + +static ULONG WINAPI ServiceProvider_AddRef(IServiceProvider *iface) +{ + return 2; +} + +static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) +{ + return 1; +} + +static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, + REFIID riid, void **ppv) +{ + if(IsEqualGUID(&CLSID_TestActiveX, guidService)) { + CHECK_EXPECT(QueryService_TestActiveX); + ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", debugstr_guid(riid)); + *ppv = &OleObject; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl ServiceProviderVtbl = { + ServiceProvider_QueryInterface, + ServiceProvider_AddRef, + ServiceProvider_Release, + ServiceProvider_QueryService +}; + +static IServiceProvider ServiceProvider = { &ServiceProviderVtbl }; + static HRESULT cs_qi(REFIID riid, void **ppv) { *ppv = NULL; @@ -1577,6 +1639,8 @@ static HRESULT cs_qi(REFIID riid, void **ppv) *ppv = &DocumentSite; else if(IsEqualGUID(&IID_IOleWindow, riid) || IsEqualGUID(&IID_IOleInPlaceSite, riid)) *ppv = &InPlaceSite; + else if(IsEqualGUID(riid, &IID_IServiceProvider)) + *ppv = &ServiceProvider; return *ppv ? S_OK : E_NOINTERFACE; }

1 0

Jacek Caban : mshtml: Fixed tests on some IE6 installations.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 0b5edecc8bc730a1be3d542b1a2ad32dd0bf1082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b5edecc8bc730a1be3d542b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 15 00:43:03 2010 +0100 mshtml: Fixed tests on some IE6 installations. --- dlls/mshtml/tests/activex.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index f163c6c..64b72c6 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -178,7 +178,7 @@ static void set_plugin_readystate(READYSTATE state) IPropertyNotifySink_Release(prop_notif); } -static void test_mon_displayname(IMoniker *mon, const char *exname) +static void test_mon_displayname(IMoniker *mon, const char *exname, const char *broken_name) { LPOLESTR display_name; DWORD mksys; @@ -186,7 +186,8 @@ static void test_mon_displayname(IMoniker *mon, const char *exname) hres = IMoniker_GetDisplayName(mon, NULL, NULL, &display_name); ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); - ok(!strcmp_wa(display_name, exname), "display_name = %s\n", wine_dbgstr_w(display_name)); + ok(!strcmp_wa(display_name, exname) || broken(broken_name && !strcmp_wa(display_name, broken_name)), + "display_name = %s\n", wine_dbgstr_w(display_name)); CoTaskMemFree(display_name); hres = IMoniker_IsSystemMoniker(mon, &mksys); @@ -486,7 +487,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper hres = IBindHost_CreateMoniker(bind_host, test_swfW, NULL, &mon, 0); ok(hres == S_OK, "CreateMoniker failed: %08x\n", hres); ok(mon != NULL, "mon == NULL\n"); - test_mon_displayname(mon, "about:test.swf"); + test_mon_displayname(mon, "about:test.swf", "about:blanktest.swf"); IMoniker_Release(mon); IBindHost_Release(bind_host); @@ -495,7 +496,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper hres = IOleClientSite_GetMoniker(client_site, OLEGETMONIKER_ONLYIFTHERE, OLEWHICHMK_CONTAINER, &mon); ok(hres == S_OK, "GetMoniker failed: %08x\n", hres); ok(mon != NULL, "mon == NULL\n"); - test_mon_displayname(mon, "about:blank"); + test_mon_displayname(mon, "about:blank", NULL); IMoniker_Release(mon); set_plugin_readystate(READYSTATE_COMPLETE);

1 0

Hans Leidekker : msi: Support MSIRUNMODE_LOGENABLED in MsiGetMode.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 942e2b2ac96767b14b33224a085078134ac8995b URL: http://source.winehq.org/git/wine.git/?a=commit;h=942e2b2ac96767b14b33224a0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 15 09:05:07 2010 +0100 msi: Support MSIRUNMODE_LOGENABLED in MsiGetMode. --- dlls/msi/install.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index a470523..e2fe863 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -716,6 +716,10 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) r = package->need_reboot; break; + case MSIRUNMODE_LOGENABLED: + r = (package->log_file != INVALID_HANDLE_VALUE); + break; + default: FIXME("unimplemented run mode: %d\n", iRunMode); r = TRUE;

1 0

Alexandre Julliard : wineboot: Set the correct architecture in the process identifier variable.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 6838b4629ef980a70dedba606ae5149cce4ad866 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6838b4629ef980a70dedba606… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 14 22:48:11 2010 +0100 wineboot: Set the correct architecture in the process identifier variable. --- programs/wineboot/wineboot.c | 20 ++++++++------------ 1 files changed, 8 insertions(+), 12 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 4407e17..43cdf3b 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -268,12 +268,13 @@ static void create_environment_registry_keys( void ) static const WCHAR ProcRevW[] = {'P','R','O','C','E','S','S','O','R','_','R','E','V','I','S','I','O','N',0}; static const WCHAR PercentDW[] = {'%','d',0}; static const WCHAR Percent04XW[] = {'%','0','4','x',0}; - static const WCHAR IntelCpuDescrW[] = {'x','8','6',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', + static const WCHAR IntelCpuDescrW[] = {'%','s',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','S','t','e','p','p','i','n','g',' ','%','d',',',' ','G','e','n','u','i','n','e','I','n','t','e','l',0}; HKEY env_key; SYSTEM_CPU_INFORMATION sci; WCHAR buffer[60]; + const WCHAR *arch; NtQuerySystemInformation( SystemCpuInformation, &sci, sizeof(sci), NULL ); @@ -284,20 +285,15 @@ static void create_environment_registry_keys( void ) switch(sci.Architecture) { - case PROCESSOR_ARCHITECTURE_AMD64: - set_reg_value( env_key, ProcArchW, AMD64W ); - break; - case PROCESSOR_ARCHITECTURE_IA64: - set_reg_value( env_key, ProcArchW, IA64W ); - break; - case PROCESSOR_ARCHITECTURE_INTEL: - default: - set_reg_value( env_key, ProcArchW, x86W ); - break; + case PROCESSOR_ARCHITECTURE_AMD64: arch = AMD64W; break; + case PROCESSOR_ARCHITECTURE_IA64: arch = IA64W; break; + default: + case PROCESSOR_ARCHITECTURE_INTEL: arch = x86W; break; } + set_reg_value( env_key, ProcArchW, arch ); /* TODO: currently hardcoded Intel, add different processors */ - sprintfW( buffer, IntelCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); + sprintfW( buffer, IntelCpuDescrW, arch, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); set_reg_value( env_key, ProcIdW, buffer ); sprintfW( buffer, PercentDW, sci.Level );

1 0

Alexandre Julliard : kernel32: Update the environment variables that vary across 32-bit/64-bit/Wow64.
by Alexandre Julliard 15 Dec '10

15 Dec '10

Module: wine Branch: master Commit: 01af5452c55c06ef827be23007482880649070d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01af5452c55c06ef827be2300… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 14 22:48:44 2010 +0100 kernel32: Update the environment variables that vary across 32-bit/64-bit/Wow64. --- dlls/kernel32/process.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 2b427b9..e29e1b2 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -542,6 +542,87 @@ static void set_additional_environment(void) } /*********************************************************************** + * set_wow64_environment + * + * Set the environment variables that change across 32/64/Wow64. + */ +static void set_wow64_environment(void) +{ + static const WCHAR archW[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','C','T','U','R','E',0}; + static const WCHAR arch6432W[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','W','6','4','3','2',0}; + static const WCHAR x86W[] = {'x','8','6',0}; + static const WCHAR versionW[] = {'M','a','c','h','i','n','e','\\', + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; + static const WCHAR progdirW[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r',0}; + static const WCHAR progdir86W[] = {'P','r','o','g','r','a','m','F','i','l','e','s','D','i','r',' ','(','x','8','6',')',0}; + static const WCHAR progfilesW[] = {'P','r','o','g','r','a','m','F','i','l','e','s',0}; + static const WCHAR progw6432W[] = {'P','r','o','g','r','a','m','W','6','4','3','2',0}; + static const WCHAR commondirW[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',0}; + static const WCHAR commondir86W[] = {'C','o','m','m','o','n','F','i','l','e','s','D','i','r',' ','(','x','8','6',')',0}; + static const WCHAR commonfilesW[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','F','i','l','e','s',0}; + static const WCHAR commonw6432W[] = {'C','o','m','m','o','n','P','r','o','g','r','a','m','W','6','4','3','2',0}; + + OBJECT_ATTRIBUTES attr; + UNICODE_STRING nameW; + WCHAR arch[64]; + WCHAR *value; + HANDLE hkey; + + /* set the PROCESSOR_ARCHITECTURE variable */ + + if (GetEnvironmentVariableW( arch6432W, arch, sizeof(arch) )) + { + if (is_win64) + { + SetEnvironmentVariableW( archW, arch ); + SetEnvironmentVariableW( arch6432W, NULL ); + } + } + else if (GetEnvironmentVariableW( archW, arch, sizeof(arch) )) + { + if (is_wow64) + { + SetEnvironmentVariableW( arch6432W, arch ); + SetEnvironmentVariableW( archW, x86W ); + } + } + + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.ObjectName = &nameW; + attr.Attributes = 0; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + RtlInitUnicodeString( &nameW, versionW ); + if (NtOpenKey( &hkey, KEY_READ | KEY_WOW64_64KEY, &attr )) return; + + /* set the ProgramFiles variables */ + + if ((value = get_reg_value( hkey, progdirW ))) + { + if (is_win64 || is_wow64) SetEnvironmentVariableW( progw6432W, value ); + if (is_win64 || !is_wow64) SetEnvironmentVariableW( progfilesW, value ); + } + if (is_wow64 && (value = get_reg_value( hkey, progdir86W ))) + SetEnvironmentVariableW( progfilesW, value ); + + /* set the CommonProgramFiles variables */ + + if ((value = get_reg_value( hkey, commondirW ))) + { + if (is_win64 || is_wow64) SetEnvironmentVariableW( commonw6432W, value ); + if (is_win64 || !is_wow64) SetEnvironmentVariableW( commonfilesW, value ); + } + if (is_wow64 && (value = get_reg_value( hkey, commondir86W ))) + SetEnvironmentVariableW( commonfilesW, value ); + + NtClose( hkey ); +} + +/*********************************************************************** * set_library_wargv * * Set the Wine library Unicode argv global variables. @@ -1125,6 +1206,7 @@ void CDECL __wine_kernel_init(void) set_registry_environment( got_environment ); set_additional_environment(); } + set_wow64_environment(); if (!(peb->ImageBaseAddress = LoadLibraryExW( main_exe_name, 0, DONT_RESOLVE_DLL_REFERENCES ))) {

1 0