wine-commits August 2012

wine-commits@winehq.org

2 participants
541 discussions

André Hentschel : Wine 1.5.12 freigegeben
by Jeremy Newman 31 Aug '12

31 Aug '12

Module: website Branch: master Commit: 7d1aa43b67b3a5f922f631515d60b4ec1dd3753b URL: http://source.winehq.org/git/website.git/?a=commit;h=7d1aa43b67b3a5f922f631… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Aug 31 20:03:57 2012 +0200 Wine 1.5.12 freigegeben --- news/de/2012083101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/de/2012083101.xml b/news/de/2012083101.xml new file mode 100644 index 0000000..ee3646a --- /dev/null +++ b/news/de/2012083101.xml @@ -0,0 +1,15 @@ +<news> +<date>31. August 2012</date> +<title>Wine 1.5.12 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.12 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.12">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung für das Deaktivieren einzelner Joysticks.</li> + <li>Bessere Unterstützung für D3DX9 Konstantentablellen.</li> + <li>Einige XRandR Verbesserungen.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.12.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.5.12
by Alexandre Julliard 31 Aug '12

31 Aug '12

Module: website Branch: master Commit: 0e26eb2eaf3660ea65eaae00e3a490f184c906af URL: http://source.winehq.org/git/website.git/?a=commit;h=0e26eb2eaf3660ea65eaae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 31 19:54:10 2012 +0200 Wine release 1.5.12 --- news/en/2012083101.xml | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/news/en/2012083101.xml b/news/en/2012083101.xml new file mode 100644 index 0000000..19be919 --- /dev/null +++ b/news/en/2012083101.xml @@ -0,0 +1,15 @@ +<news> +<date>August 31, 2012</date> +<title>Wine 1.5.12 Released</title> +<body> + The Wine development release 1.5.12 is now available. + <a href="{$root}/announce/1.5.12">What's new</a> in this release: +<ul> + <li>Support for disabling individual joysticks.</li> + <li>Better support for D3DX9 constant tables.</li> + <li>Some XRandR improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.12.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.5.12 : Alexandre Julliard : Release 1.5.12
by Alexandre Julliard 31 Aug '12

31 Aug '12

Module: wine Branch: refs/tags/wine-1.5.12 Tag: d6d6e1c385b6f9eb4c4ee7079d5f4d9410c8a66e URL: http://source.winehq.org/git/wine.git/?a=tag;h=d6d6e1c385b6f9eb4c4ee7079d5f… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 31 19:43:48 2012 +0200 Release 1.5.12

1 0

Alexandre Julliard : Release 1.5.12.
by Alexandre Julliard 31 Aug '12

31 Aug '12

Module: wine Branch: master Commit: b8ef9b566942f329c4c6486bffc8f12bfaac3999 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ef9b566942f329c4c6486bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 31 19:43:48 2012 +0200 Release 1.5.12. --- ANNOUNCE | 684 +++++++++++++++++++++++++++---------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 312 insertions(+), 392 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8ef9b566942f329c4c64…

1 0

Piotr Caban : dxdiagn: Initialize ProcessorEnglish property.
by Alexandre Julliard 31 Aug '12

31 Aug '12

Module: wine Branch: master Commit: 2bfbac07a8ea01efd2d87dcafd01f876c53fff2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bfbac07a8ea01efd2d87dcaf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 31 15:59:22 2012 +0200 dxdiagn: Initialize ProcessorEnglish property. --- dlls/dxdiagn/provider.c | 80 +++++++++++++++++++++++++++++++++++++++- dlls/dxdiagn/tests/container.c | 2 + 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 1e00a90..b207c9a 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -38,6 +38,7 @@ #include "initguid.h" #include "fil_data.h" #include "psapi.h" +#include "wbemcli.h" #include "wine/debug.h" @@ -554,6 +555,82 @@ static HRESULT fill_os_string_information(IDxDiagContainerImpl_Container *node, return S_OK; } +static HRESULT fill_processor_information(IDxDiagContainerImpl_Container *node) +{ + static const WCHAR szProcessorEnglish[] = {'s','z','P','r','o','c','e','s','s','o','r','E','n','g','l','i','s','h',0}; + + static const WCHAR cimv2W[] = {'\\','\\','.','\\','r','o','o','t','\\','c','i','m','v','2',0}; + static const WCHAR proc_classW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; + static const WCHAR nameW[] = {'N','a','m','e',0}; + static const WCHAR max_clock_speedW[] = {'M','a','x','C','l','o','c','k','S','p','e','e','d',0}; + static const WCHAR cpu_noW[] = {'N','u','m','b','e','r','O','f','L','o','g','i','c','a','l','P','r','o','c','e','s','s','o','r','s',0}; + + static const WCHAR processor_fmtW[] = {'%','s','(','%','d',' ','C','P','U','s',')',',',' ','~','%','d','M','H','z',0}; + + IWbemLocator *wbem_locator; + IWbemServices *wbem_service; + IWbemClassObject *wbem_class; + IEnumWbemClassObject *wbem_enum; + VARIANT cpu_name, cpu_no, clock_speed; + WCHAR print_buf[200]; + BSTR bstr; + ULONG no; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_WbemLocator, NULL, CLSCTX_INPROC_SERVER, &IID_IWbemLocator, (void**)&wbem_locator); + if(FAILED(hr)) + return hr; + + bstr = SysAllocString(cimv2W); + if(!bstr) { + IWbemLocator_Release(wbem_locator); + return E_OUTOFMEMORY; + } + hr = IWbemLocator_ConnectServer(wbem_locator, bstr, NULL, NULL, NULL, 0, NULL, NULL, &wbem_service); + IWbemLocator_Release(wbem_locator); + SysFreeString(bstr); + if(FAILED(hr)) + return hr; + + bstr = SysAllocString(proc_classW); + if(!bstr) { + IWbemServices_Release(wbem_service); + return E_OUTOFMEMORY; + } + hr = IWbemServices_CreateInstanceEnum(wbem_service, bstr, WBEM_FLAG_SYSTEM_ONLY, NULL, &wbem_enum); + IWbemServices_Release(wbem_service); + SysFreeString(bstr); + if(FAILED(hr)) + return hr; + + hr = IEnumWbemClassObject_Next(wbem_enum, 1000, 1, &wbem_class, &no); + IEnumWbemClassObject_Release(wbem_enum); + if(FAILED(hr)) + return hr; + + hr = IWbemClassObject_Get(wbem_class, cpu_noW, 0, &cpu_no, NULL, NULL); + if(FAILED(hr)) { + IWbemClassObject_Release(wbem_class); + return hr; + } + hr = IWbemClassObject_Get(wbem_class, max_clock_speedW, 0, &clock_speed, NULL, NULL); + if(FAILED(hr)) { + IWbemClassObject_Release(wbem_class); + return hr; + } + hr = IWbemClassObject_Get(wbem_class, nameW, 0, &cpu_name, NULL, NULL); + IWbemClassObject_Release(wbem_class); + if(FAILED(hr)) + return hr; + + sprintfW(print_buf, processor_fmtW, V_BSTR(&cpu_name), V_I4(&cpu_no), V_I4(&clock_speed)); + VariantClear(&cpu_name); + VariantClear(&cpu_no); + VariantClear(&clock_speed); + + return add_bstr_property(node, szProcessorEnglish, print_buf); +} + static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) { static const WCHAR dwDirectXVersionMajor[] = {'d','w','D','i','r','e','c','t','X','V','e','r','s','i','o','n','M','a','j','o','r',0}; @@ -584,7 +661,6 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) static const WCHAR szSystemManufacturerEnglish[] = {'s','z','S','y','s','t','e','m','M','a','n','u','f','a','c','t','u','r','e','r','E','n','g','l','i','s','h',0}; static const WCHAR szSystemModelEnglish[] = {'s','z','S','y','s','t','e','m','M','o','d','e','l','E','n','g','l','i','s','h',0}; static const WCHAR szBIOSEnglish[] = {'s','z','B','I','O','S','E','n','g','l','i','s','h',0}; - static const WCHAR szProcessorEnglish[] = {'s','z','P','r','o','c','e','s','s','o','r','E','n','g','l','i','s','h',0}; static const WCHAR szSetupParamEnglish[] = {'s','z','S','e','t','u','p','P','a','r','a','m','E','n','g','l','i','s','h',0}; static const WCHAR szDxDiagVersion[] = {'s','z','D','x','D','i','a','g','V','e','r','s','i','o','n',0}; @@ -725,7 +801,7 @@ static HRESULT build_systeminfo_tree(IDxDiagContainerImpl_Container *node) if (FAILED(hr)) return hr; - hr = add_bstr_property(node, szProcessorEnglish, szEmpty); + hr = fill_processor_information(node); if (FAILED(hr)) return hr; diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index d430bf4..9959665 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -856,6 +856,7 @@ static void test_DxDiag_SystemInfo(void) static const WCHAR szOSEnglish[] = {'s','z','O','S','E','n','g','l','i','s','h',0}; static const WCHAR szOSExEnglish[] = {'s','z','O','S','E','x','E','n','g','l','i','s','h',0}; static const WCHAR szOSExLongEnglish[] = {'s','z','O','S','E','x','L','o','n','g','E','n','g','l','i','s','h',0}; + static const WCHAR szProcessorEnglish[] = {'s','z','P','r','o','c','e','s','s','o','r','E','n','g','l','i','s','h',0}; static const struct property_test property_tests[] = { @@ -891,6 +892,7 @@ static void test_DxDiag_SystemInfo(void) {szOSEnglish, VT_BSTR}, {szOSExEnglish, VT_BSTR}, {szOSExLongEnglish, VT_BSTR}, + {szProcessorEnglish, VT_BSTR}, }; IDxDiagContainer *container;

1 0

Piotr Caban : wbemprox: Added MaxClockSpeed and NumberOfLogicalProcessors builtin properties.
by Alexandre Julliard 31 Aug '12

31 Aug '12

Module: wine Branch: master Commit: 1711b99e980b2fb39d2f35c69777e5b34cdf458a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1711b99e980b2fb39d2f35c69… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Aug 31 15:58:47 2012 +0200 wbemprox: Added MaxClockSpeed and NumberOfLogicalProcessors builtin properties. --- dlls/wbemprox/builtin.c | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 8f2335b..19afa0c 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -163,6 +163,10 @@ static const WCHAR prop_totalphysicalmemoryW[] = {'T','o','t','a','l','P','h','y','s','i','c','a','l','M','e','m','o','r','y',0}; static const WCHAR prop_typeW[] = {'T','y','p','e',0}; +static const WCHAR prop_maxclockspeedW[] = + {'M','a','x','C','l','o','c','k','S','p','e','e','d',0}; +static const WCHAR prop_numberoflogicalprocessorsW[] = + {'N','u','m','b','e','r','O','f','L','o','g','i','c','a','l','P','r','o','c','e','s','s','o','r','s',0}; static const WCHAR method_enumkeyW[] = {'E','n','u','m','K','e','y',0}; @@ -249,11 +253,13 @@ static const struct column col_process[] = }; static const struct column col_processor[] = { - { prop_cpustatusW, CIM_UINT16 }, - { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, - { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, - { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC } + { prop_cpustatusW, CIM_UINT16 }, + { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, + { prop_manufacturerW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_maxclockspeedW, CIM_UINT32 }, + { prop_nameW, CIM_STRING|COL_FLAG_DYNAMIC }, + { prop_numberoflogicalprocessorsW, CIM_UINT32 }, + { prop_processoridW, CIM_STRING|COL_FLAG_DYNAMIC } }; static const struct column col_service[] = { @@ -390,7 +396,9 @@ struct record_processor UINT16 cpu_status; const WCHAR *device_id; const WCHAR *manufacturer; + UINT32 maxclockspeed; const WCHAR *name; + UINT32 numberoflogicalprocessors; const WCHAR *processor_id; }; struct record_service @@ -747,7 +755,8 @@ static void fill_processor( struct table *table ) static const WCHAR fmtW[] = {'C','P','U','%','u',0}; WCHAR device_id[14], processor_id[17], manufacturer[13], name[49] = {0}; struct record_processor *rec; - UINT i, offset = 0, count = get_processor_count(); + UINT i, offset = 0, count = get_processor_count(), cpuMhz; + PROCESSOR_POWER_INFORMATION ppi; if (!(table->data = heap_alloc( sizeof(*rec) * count ))) return; @@ -755,6 +764,11 @@ static void fill_processor( struct table *table ) get_processor_manufacturer( manufacturer ); get_processor_name( name ); + if(!NtPowerInformation(ProcessorInformation, NULL, 0, &ppi, sizeof(ppi))) + cpuMhz = ppi.MaxMhz; + else + cpuMhz = 1000000; + for (i = 0; i < count; i++) { rec = (struct record_processor *)(table->data + offset); @@ -762,7 +776,9 @@ static void fill_processor( struct table *table ) sprintfW( device_id, fmtW, i ); rec->device_id = heap_strdupW( device_id ); rec->manufacturer = heap_strdupW( manufacturer ); + rec->maxclockspeed = cpuMhz; rec->name = heap_strdupW( name ); + rec->numberoflogicalprocessors = count; rec->processor_id = heap_strdupW( processor_id ); offset += sizeof(*rec); }

1 0

Dmitry Timoshkov : gdiplus: Add a test for scaling an image with world transform.
by Alexandre Julliard 31 Aug '12

31 Aug '12

Module: wine Branch: master Commit: bf0f8c970fa8e068d187a162de2ce75fee94fa3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf0f8c970fa8e068d187a162d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 31 16:20:26 2012 +0900 gdiplus: Add a test for scaling an image with world transform. --- dlls/gdiplus/tests/image.c | 91 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 4e65b5e..45ac01f 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3790,6 +3790,96 @@ static void test_image_format(void) } } +static void test_DrawImage_scale(void) +{ + static const BYTE back_8x1[24] = { 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40, + 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40 }; + static const BYTE image_080[24] = { 0x40,0x40,0x40,0x80,0x80,0x80,0x40,0x40,0x40,0x40,0x40,0x40, + 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40 }; + static const BYTE image_100[24] = { 0x40,0x40,0x40,0x80,0x80,0x80,0x80,0x80,0x80,0x40,0x40,0x40, + 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40 }; + static const BYTE image_120[24] = { 0x40,0x40,0x40,0x40,0x40,0x40,0x80,0x80,0x80,0x40,0x40,0x40, + 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40 }; + static const BYTE image_150[24] = { 0x40,0x40,0x40,0x40,0x40,0x40,0x80,0x80,0x80,0x80,0x80,0x80, + 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40 }; + static const BYTE image_180[24] = { 0x40,0x40,0x40,0x40,0x40,0x40,0x80,0x80,0x80,0x80,0x80,0x80, + 0x80,0x80,0x80,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40 }; + static const BYTE image_200[24] = { 0x40,0x40,0x40,0x40,0x40,0x40,0x80,0x80,0x80,0x80,0x80,0x80, + 0x80,0x80,0x80,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40 }; + static const BYTE image_250[24] = { 0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x80,0x80,0x80, + 0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x40,0x40,0x40 }; + static const struct test_data + { + REAL scale_x; + const BYTE *image; + } td[] = + { + { 0.8, image_080 }, + { 1.0, image_100 }, + { 1.2, image_120 }, + { 1.5, image_150 }, + { 1.8, image_180 }, + { 2.0, image_200 }, + { 2.5, image_250 } + }; + BYTE src_2x1[6] = { 0x80,0x80,0x80,0x80,0x80,0x80 }; + BYTE dst_8x1[24]; + GpStatus status; + union + { + GpBitmap *bitmap; + GpImage *image; + } u1, u2; + GpGraphics *graphics; + GpMatrix *matrix; + int i, match; + + status = GdipCreateBitmapFromScan0(2, 1, 4, PixelFormat24bppRGB, src_2x1, &u1.bitmap); + expect(Ok, status); + status = GdipBitmapSetResolution(u1.bitmap, 100.0, 100.0); + expect(Ok, status); + + status = GdipCreateBitmapFromScan0(8, 1, 24, PixelFormat24bppRGB, dst_8x1, &u2.bitmap); + expect(Ok, status); + status = GdipBitmapSetResolution(u2.bitmap, 100.0, 100.0); + expect(Ok, status); + status = GdipGetImageGraphicsContext(u2.image, &graphics); + expect(Ok, status); + status = GdipSetInterpolationMode(graphics, InterpolationModeNearestNeighbor); + expect(Ok, status); + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + status = GdipCreateMatrix2(td[i].scale_x, 0.0, 0.0, 1.0, 0.0, 0.0, &matrix); + expect(Ok, status); + status = GdipSetWorldTransform(graphics, matrix); + expect(Ok, status); + GdipDeleteMatrix(matrix); + + memcpy(dst_8x1, back_8x1, sizeof(dst_8x1)); + status = GdipDrawImageI(graphics, u1.image, 1, 0); + expect(Ok, status); + + match = memcmp(dst_8x1, td[i].image, sizeof(dst_8x1)) == 0; + ok(match, "%d: data should match\n", i); + if (!match) + { + UINT i, size = sizeof(dst_8x1); + const BYTE *bits = dst_8x1; + for (i = 0; i < size; i++) + printf(" %02x", bits[i]); + printf("\n"); + } + } + + status = GdipDeleteGraphics(graphics); + expect(Ok, status); + status = GdipDisposeImage(u1.image); + expect(Ok, status); + status = GdipDisposeImage(u2.image); + expect(Ok, status); +} + START_TEST(image) { struct GdiplusStartupInput gdiplusStartupInput; @@ -3802,6 +3892,7 @@ START_TEST(image) GdiplusStartup(&gdiplusToken, &gdiplusStartupInput, NULL); + test_DrawImage_scale(); test_image_format(); test_DrawImage(); test_GdipDrawImagePointRect();

1 0

Erich Hoover : hhctrl.ocx: Implement HH_SET_WIN_TYPE.
by Alexandre Julliard 31 Aug '12

31 Aug '12

Module: wine Branch: master Commit: 182bd9dac4b8f4a96a64d2d00915083daaff3527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=182bd9dac4b8f4a96a64d2d00… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Aug 30 12:16:54 2012 -0600 hhctrl.ocx: Implement HH_SET_WIN_TYPE. --- dlls/hhctrl.ocx/help.c | 17 ++++++-- dlls/hhctrl.ocx/hhctrl.c | 108 +++++++++++++++++++++++++++++++++++++--------- dlls/hhctrl.ocx/hhctrl.h | 3 +- 3 files changed, 102 insertions(+), 26 deletions(-) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 29751ea..6671f70 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -1739,6 +1739,7 @@ static BOOL CreateViewer(HHInfo *pHHInfo) InitContent(pHHInfo); InitIndex(pHHInfo); + pHHInfo->viewer_initialized = TRUE; return TRUE; } @@ -1784,11 +1785,17 @@ void ReleaseHelpViewer(HHInfo *info) OleUninitialize(); } -HHInfo *CreateHelpViewer(LPCWSTR filename, HWND caller) +HHInfo *CreateHelpViewer(HHInfo *info, LPCWSTR filename, HWND caller) { - HHInfo *info = heap_alloc_zero(sizeof(HHInfo)); + BOOL add_to_window_list = FALSE; int i; + if(!info) + { + info = heap_alloc_zero(sizeof(HHInfo)); + add_to_window_list = TRUE; + } + /* Set the invalid tab ID (-1) as the default value for all * of the tabs, this matches a failed TCM_INSERTITEM call. */ @@ -1809,12 +1816,14 @@ HHInfo *CreateHelpViewer(LPCWSTR filename, HWND caller) } info->WinType.hwndCaller = caller; - if(!CreateViewer(info)) { + if(!info->viewer_initialized && !CreateViewer(info)) { ReleaseHelpViewer(info); return NULL; } - list_add_tail(&window_list, &info->entry); + if(add_to_window_list) + list_add_tail(&window_list, &info->entry); + return info; } diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 5244e10..4ed9afc 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -146,6 +146,18 @@ static BOOL resolve_filename(const WCHAR *filename, WCHAR *fullname, DWORD bufle return (GetFileAttributesW(fullname) != INVALID_FILE_ATTRIBUTES); } +static inline HHInfo *find_window(const WCHAR *window) +{ + HHInfo *info; + + LIST_FOR_EACH_ENTRY(info, &window_list, HHInfo, entry) + { + if (strcmpW(info->WinType.pszType, window) == 0) + return info; + } + return NULL; +} + /****************************************************************** * HtmlHelpW (HHCTRL.OCX.15) */ @@ -163,9 +175,9 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat case HH_DISPLAY_TOC: case HH_DISPLAY_INDEX: case HH_DISPLAY_SEARCH:{ - HHInfo *info; BOOL res; NMHDR nmhdr; + HHInfo *info = NULL; WCHAR *window = NULL; const WCHAR *index = NULL; WCHAR *default_index = NULL; @@ -181,7 +193,10 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat } index = default_index; - info = CreateHelpViewer(fullname, caller); + if (window) + info = find_window(window); + + info = CreateHelpViewer(info, fullname, caller); if(!info) { heap_free(default_index); @@ -253,7 +268,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat return 0; } - info = CreateHelpViewer(fullname, caller); + info = CreateHelpViewer(NULL, fullname, caller); if(!info) return NULL; @@ -288,6 +303,33 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat } return 0; } + case HH_SET_WIN_TYPE: { + HH_WINTYPEW *wintype = (HH_WINTYPEW *)data; + WCHAR *window = NULL; + HHInfo *info = NULL; + + if (!filename && wintype->pszType) + window = strdupW(wintype->pszType); + else if (!filename || !resolve_filename(filename, fullname, MAX_PATH, NULL, &window) || !window) + { + WARN("can't find window name: %s\n", debugstr_w(filename)); + return 0; + } + info = find_window(window); + if (!info) + { + info = heap_alloc_zero(sizeof(HHInfo)); + info->WinType.pszType = info->stringsW.pszType = window; + list_add_tail(&window_list, &info->entry); + } + else + heap_free(window); + + TRACE("Changing WINTYPE, fsValidMembers=0x%x\n", wintype->fsValidMembers); + + MergeChmProperties(wintype, info); + return 0; + } default: FIXME("HH case %s not handled.\n", command_to_string( command )); } @@ -295,21 +337,35 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat return 0; } +static HH_WINTYPEW *wintypeAtoW(HH_WINTYPEA *data, struct wintype_stringsW *stringsW) +{ + HH_WINTYPEW *wdata; + + wdata = heap_alloc(sizeof(*wdata)); + memcpy(wdata, data, sizeof(*data)); + /* convert all of the ANSI strings to Unicode */ + wdata->pszType = stringsW->pszType = strdupAtoW(data->pszType); + wdata->pszCaption = stringsW->pszCaption = strdupAtoW(data->pszCaption); + wdata->pszToc = stringsW->pszToc = strdupAtoW(data->pszToc); + wdata->pszIndex = stringsW->pszIndex = strdupAtoW(data->pszIndex); + wdata->pszFile = stringsW->pszFile = strdupAtoW(data->pszFile); + wdata->pszHome = stringsW->pszHome = strdupAtoW(data->pszHome); + wdata->pszJump1 = stringsW->pszJump1 = strdupAtoW(data->pszJump1); + wdata->pszJump2 = stringsW->pszJump2 = strdupAtoW(data->pszJump2); + wdata->pszUrlJump1 = stringsW->pszUrlJump1 = strdupAtoW(data->pszUrlJump1); + wdata->pszUrlJump2 = stringsW->pszUrlJump2 = strdupAtoW(data->pszUrlJump2); + wdata->pszCustomTabs = stringsW->pszCustomTabs = strdupAtoW(data->pszCustomTabs); + + return wdata; +} + /****************************************************************** * HtmlHelpA (HHCTRL.OCX.14) */ HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD_PTR data) { - WCHAR *wfile = NULL, *wdata = NULL; - DWORD len; - HWND result; - - if (filename) - { - len = MultiByteToWideChar( CP_ACP, 0, filename, -1, NULL, 0 ); - wfile = heap_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar( CP_ACP, 0, filename, -1, wfile, len ); - } + WCHAR *wfile = strdupAtoW( filename ); + HWND result = 0; if (data) { @@ -321,20 +377,31 @@ HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD_PTR data case HH_GET_LAST_ERROR: case HH_GET_WIN_TYPE: case HH_KEYWORD_LOOKUP: - case HH_SET_WIN_TYPE: case HH_SYNC: FIXME("structures not handled yet\n"); break; + case HH_SET_WIN_TYPE: + { + struct wintype_stringsW stringsW; + HH_WINTYPEW *wdata = wintypeAtoW((HH_WINTYPEA *)data, &stringsW); + result = HtmlHelpW( caller, wfile, command, (DWORD_PTR)wdata ); + wintype_stringsW_free(&stringsW); + heap_free( wdata ); + goto done; + } + case HH_DISPLAY_INDEX: case HH_DISPLAY_TOPIC: case HH_DISPLAY_TOC: case HH_GET_WIN_HANDLE: case HH_SAFE_DISPLAY_TOPIC: - len = MultiByteToWideChar( CP_ACP, 0, (const char*)data, -1, NULL, 0 ); - wdata = heap_alloc(len*sizeof(WCHAR)); - MultiByteToWideChar( CP_ACP, 0, (const char*)data, -1, wdata, len ); - break; + { + WCHAR *wdata = strdupAtoW( (const char *)data ); + result = HtmlHelpW( caller, wfile, command, (DWORD_PTR)wdata ); + heap_free(wdata); + goto done; + } case HH_CLOSE_ALL: case HH_HELP_CONTEXT: @@ -352,10 +419,9 @@ HWND WINAPI HtmlHelpA(HWND caller, LPCSTR filename, UINT command, DWORD_PTR data } } - result = HtmlHelpW( caller, wfile, command, wdata ? (DWORD_PTR)wdata : data ); - + result = HtmlHelpW( caller, wfile, command, data ); +done: heap_free(wfile); - heap_free(wdata); return result; } diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 4cacbb3..900bbb4 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -175,6 +175,7 @@ typedef struct { HFONT hFont; HHTab tabs[TAB_FAVORITES+1]; + int viewer_initialized; DWORD current_tab; } HHInfo; @@ -198,7 +199,7 @@ IStream *GetChmStream(CHMInfo*,LPCWSTR,ChmPath*) DECLSPEC_HIDDEN; LPWSTR FindContextAlias(CHMInfo*,DWORD) DECLSPEC_HIDDEN; WCHAR *GetDocumentTitle(CHMInfo*,LPCWSTR) DECLSPEC_HIDDEN; -HHInfo *CreateHelpViewer(LPCWSTR,HWND) DECLSPEC_HIDDEN; +HHInfo *CreateHelpViewer(HHInfo*,LPCWSTR,HWND) DECLSPEC_HIDDEN; void ReleaseHelpViewer(HHInfo*) DECLSPEC_HIDDEN; BOOL NavigateToUrl(HHInfo*,LPCWSTR) DECLSPEC_HIDDEN; BOOL NavigateToChm(HHInfo*,LPCWSTR,LPCWSTR) DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : winetest: Remove an unused struct field.
by Alexandre Julliard 31 Aug '12

31 Aug '12

Module: wine Branch: master Commit: 74ab51dc3d70df49f4843e0594dce7337ded8887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=74ab51dc3d70df49f4843e059… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Aug 31 00:09:02 2012 +0200 winetest: Remove an unused struct field. --- programs/winetest/main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index ea74a06..2a74455 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -46,7 +46,6 @@ struct wine_test { char *name; - int resource; int subtest_count; char **subtests; char *exename;

1 0

Michael Stefaniuc : dsound: Move the capture structs declarations to the . c file.
by Alexandre Julliard 31 Aug '12

31 Aug '12

Module: wine Branch: master Commit: ebf33fff47b773420cd1f8006fc8118f4e1a9d2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf33fff47b773420cd1f8006… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 30 23:48:27 2012 +0200 dsound: Move the capture structs declarations to the .c file. --- dlls/dsound/capture.c | 37 +++++++++++++++++++++++++++++++++ dlls/dsound/dsound_private.h | 47 ------------------------------------------ 2 files changed, 37 insertions(+), 47 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 8d0fc65..309702a 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -43,6 +43,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(dsound); +typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice; + +/* IDirectSoundCaptureBuffer implementation structure */ +typedef struct IDirectSoundCaptureBufferImpl +{ + IDirectSoundCaptureBuffer8 IDirectSoundCaptureBuffer8_iface; + IDirectSoundNotify IDirectSoundNotify_iface; + LONG numIfaces; /* "in use interfaces" refcount */ + LONG ref, refn; + /* IDirectSoundCaptureBuffer fields */ + DirectSoundCaptureDevice *device; + DSCBUFFERDESC *pdscbd; + DWORD flags; + /* IDirectSoundNotify fields */ + DSBPOSITIONNOTIFY *notifies; + int nrofnotifies; +} IDirectSoundCaptureBufferImpl; + +/* DirectSoundCaptureDevice implementation structure */ +struct DirectSoundCaptureDevice +{ + GUID guid; + LONG ref; + DSCCAPS drvcaps; + BYTE *buffer; + DWORD buflen, write_pos_bytes; + WAVEFORMATEX *pwfx; + IDirectSoundCaptureBufferImpl *capture_buffer; + DWORD state; + UINT timerID; + CRITICAL_SECTION lock; + IMMDevice *mmdevice; + IAudioClient *client; + IAudioCaptureClient *capture; + struct list entry; +}; + static void capturebuffer_destroy(IDirectSoundCaptureBufferImpl *This) { diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 0d2cf75..eb582da 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -40,9 +40,7 @@ extern int ds_default_bits_per_sample DECLSPEC_HIDDEN; * Predeclare the interface implementation structures */ typedef struct IDirectSoundBufferImpl IDirectSoundBufferImpl; -typedef struct IDirectSoundCaptureBufferImpl IDirectSoundCaptureBufferImpl; typedef struct DirectSoundDevice DirectSoundDevice; -typedef struct DirectSoundCaptureDevice DirectSoundCaptureDevice; /* dsound_convert.h */ typedef float (*bitsgetfunc)(const IDirectSoundBufferImpl *, DWORD, DWORD); @@ -209,51 +207,6 @@ const IDirectSound3DListenerVtbl ds3dlvt DECLSPEC_HIDDEN; const IDirectSound3DBufferVtbl ds3dbvt DECLSPEC_HIDDEN; const IKsPropertySetVtbl iksbvt DECLSPEC_HIDDEN; -/***************************************************************************** - * DirectSoundCaptureDevice implementation structure - */ -struct DirectSoundCaptureDevice -{ - GUID guid; - LONG ref; - - DSCCAPS drvcaps; - - LPBYTE buffer; - DWORD buflen, write_pos_bytes; - - PWAVEFORMATEX pwfx; - - IDirectSoundCaptureBufferImpl* capture_buffer; - DWORD state; - UINT timerID; - CRITICAL_SECTION lock; - - IMMDevice *mmdevice; - IAudioClient *client; - IAudioCaptureClient *capture; - - struct list entry; -}; - -/***************************************************************************** - * IDirectSoundCaptureBuffer implementation structure - */ -struct IDirectSoundCaptureBufferImpl -{ - IDirectSoundCaptureBuffer8 IDirectSoundCaptureBuffer8_iface; - IDirectSoundNotify IDirectSoundNotify_iface; - LONG numIfaces; /* "in use interfaces" refcount */ - LONG ref, refn; - /* IDirectSoundCaptureBuffer fields */ - DirectSoundCaptureDevice* device; - LPDSCBUFFERDESC pdscbd; - DWORD flags; - /* IDirectSoundNotify fields */ - LPDSBPOSITIONNOTIFY notifies; - int nrofnotifies; -}; - HRESULT IKsPrivatePropertySetImpl_Create(REFIID riid, void **ppv) DECLSPEC_HIDDEN; /*******************************************************************************

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2012