- wine-devel - winehq.org

[PATCH] kernelbase: Quiet a noisy fixme in QuirkIsEnabled3
by Louis Lenders 15 Dec '17

15 Dec '17

This one spams the console while running several .Net programs

1 0

[PATCH] testbot/web: Remove an unnecessary WineTestBot::Config prefix.
by Francois Gouget 15 Dec '17

15 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/index.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index b0c2d450..deacf909 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -277,7 +277,7 @@ sub GenerateBody($) my $JobsCollectionBlock = new JobStatusBlock($Jobs, $self); $JobsCollectionBlock->GenerateList(); - if ($WineTestBot::Config::JobArchiveDays != 0) + if ($JobArchiveDays != 0) { my $PropertyDescriptor = $Jobs->GetPropertyDescriptorByName('Id'); my $MaxIdLength = $PropertyDescriptor->GetMaxLength(); -- 2.15.1

1 0

[PATCH] testbot/Engine: Fix handling of --kill-vms.
by Francois Gouget 15 Dec '17

15 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index dfe266f1..7dab98e6 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -207,6 +207,12 @@ sub Cleanup($;$$) $VM->RunPowerOff(); } } + # $KillVMs is normally used on shutdown so don't start a process that + # will get stuck 'forever' waiting for an offline VM. + elsif ($KillVMs and $VM->Status !~ /^(?:off|offline)$/) + { + $VM->RunPowerOff(); + } } } -- 2.15.1

1 0

[PATCH] testbot/Engine: Don't override $MaxVMsWhenIdle == 0.
by Francois Gouget 15 Dec '17

15 Dec '17

It should only be set to the default if left undefined. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index ad492f61..dfe266f1 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -714,7 +714,7 @@ sub main() $MaxRevertsWhileRunningVMs = $MaxRevertingVMs; LogMsg "Capping MaxRevertsWhileRunningVMs to MaxRevertingVMs ($MaxRevertsWhileRunningVMs)\n"; } - $MaxVMsWhenIdle ||= $MaxActiveVMs; + $MaxVMsWhenIdle = $MaxActiveVMs if (!defined $MaxVMsWhenIdle); Cleanup(1); # Check for patches that arrived while the server was off. -- 2.15.1

1 0

[PATCH] testbot: Set $MaxRevertsWhileRunningVMs = 0 in the default configuration.
by Francois Gouget 15 Dec '17

15 Dec '17

It's the safe option as it ensure the revert will not interfere with the tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- It's also what we use on the TestBot (I think). testbot/lib/WineTestBot/Config.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index b0492a39..8388a0ed 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -67,7 +67,7 @@ $BinDir = "$::RootDir/bin"; # See the ScheduleOnHost() documentation in lib/WineTestBot/Jobs.pm $MaxRevertingVMs = 1; -$MaxRevertsWhileRunningVMs = 1; +$MaxRevertsWhileRunningVMs = 0; $MaxActiveVMs = 2; $MaxVMsWhenIdle = undef; -- 2.15.1

1 0

[PATCH] testbot/web: Document that the Redirect() calls don't return.
by Francois Gouget 15 Dec '17

15 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/CGI/ItemPage.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 9d1525d1..a07f02be 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -171,7 +171,7 @@ sub RedirectToList($) "=" . url_escape($MasterColValues->[$ColIndex]); } } - $self->Redirect($Target); + $self->Redirect($Target); # does not return } 1; -- 2.15.1

1 0

[PATCH] usp10: Fix a typo in an ERR() message.
by Andrey Gusev 15 Dec '17

15 Dec '17

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/usp10/opentype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 0351f4f4af..1fd9c4d3c6 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -2051,7 +2051,7 @@ static void GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_A } if (!offset) { - ERR("Failed to find avalible ligature connection point\n"); + ERR("Failed to find available ligature connection point\n"); return; } -- 2.13.6

2 1

crash due to weird freetype font in gdiplus/sse
by Marcus Meissner 14 Dec '17

14 Dec '17

Hi, we saw this during wineconf http://test.winehq.org/data/010119085b4cee3d7edbad2c5a46d35daa95000d/linux_… the actual instruction is: cvttsd2si $xmm0, $eax which receives a FPE trap as the content of $xmm0 does not fit into $eax. http://www.jaist.ac.jp/iscenter-new/mpc/altix/altixdata/opt/intel/vtune/doc… This means someone switched on FPE traps for XMM instructions in $CR4 register, which I would expect freetype2 the prime candidate if it is not Wine itself. Debugging shows that capEmHeight and capXHeight are both values < 0. long story short, in the loader we get these values: fixme:font:get_outline_text_metrics L"Goha-Tibeb Zemen" sCapHeight=-32768 fixme:font:get_outline_text_metrics L"Goha-Tibeb Zemen" sxHeight=-32768 The documentation does not give 0x8000 a specific meaning in the OS2 table. I can provide this font if needed for debugging. Ciao, Marcus

3 4

Code freeze got you down? Try fixing a test!
by Jeremy White 14 Dec '17

14 Dec '17

Just think how much you will brighten the solstice by finding and fixing one of our tests! Or, if you're a south hemispherean, it's way too hot to go out, so you should stay in and fix a test. A curated list test failures on our static Windows VMs and on a first Linux machine is here: https://www.winehq.org/~jwhite/latest.html We've made some good progress lately; we are down to 10 failures total on the Linux box, only 3 of which are consistent. Windows failures are way down; although we still have a nice bunch of Windows 8 and 10 failures left. In fact, the thing we have the *most* of are sporadic Windows 10 failures - everyone's favorite! Alexandre assures me that test fixes are welcome during code freeze, so bring some solstice joy and fix those tests! Cheers, Jeremy p.s. If you research a bug, and would like me to update the annotation I track for it, just shoot me an email to let me know.

2 1

[PATCH 2/2] ole32: Correctly save the remaining formats if their data has not been set.
by Huw Davies 14 Dec '17

14 Dec '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 48 +++++++++++++++++++++--------------------------- dlls/ole32/tests/ole2.c | 47 ++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 59 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index ae05b8e176..ad55c6e561 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -829,17 +829,16 @@ static HRESULT save_dib(DataCacheEntry *entry, BOOL contents, IStream *stream) if (hr == S_OK && data_size) hr = IStream_Write(stream, bmi, data_size, NULL); } - else + else if(data_size) { BITMAPFILEHEADER bmp_fhdr; bmp_fhdr.bfType = 0x4d42; bmp_fhdr.bfSize = data_size + sizeof(BITMAPFILEHEADER); bmp_fhdr.bfReserved1 = bmp_fhdr.bfReserved2 = 0; - if (data_size) - bmp_fhdr.bfOffBits = bitmap_info_size(bmi, DIB_RGB_COLORS) + sizeof(BITMAPFILEHEADER); + bmp_fhdr.bfOffBits = bitmap_info_size(bmi, DIB_RGB_COLORS) + sizeof(BITMAPFILEHEADER); hr = IStream_Write(stream, &bmp_fhdr, sizeof(BITMAPFILEHEADER), NULL); - if (hr == S_OK && data_size) + if (hr == S_OK) hr = IStream_Write(stream, bmi, data_size, NULL); } @@ -897,25 +896,22 @@ static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream hr = IStream_Write(stream, data, data_size, NULL); HeapFree(GetProcessHeap(), 0, data); } - else + else if (entry->stgmedium.tymed != TYMED_NULL) { struct meta_placeable meta_place_rec; WORD *check; - if (entry->stgmedium.tymed != TYMED_NULL) + mfpict = GlobalLock(entry->stgmedium.u.hMetaFilePict); + if (!mfpict) + return DV_E_STGMEDIUM; + data_size = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); + data = HeapAlloc(GetProcessHeap(), 0, data_size); + if (!data) { - mfpict = GlobalLock(entry->stgmedium.u.hMetaFilePict); - if (!mfpict) - return DV_E_STGMEDIUM; - data_size = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); - data = HeapAlloc(GetProcessHeap(), 0, data_size); - if (!data) - { - GlobalUnlock(entry->stgmedium.u.hMetaFilePict); - return E_OUTOFMEMORY; - } - GetMetaFileBitsEx(mfpict->hMF, data_size, data); + GlobalUnlock(entry->stgmedium.u.hMetaFilePict); + return E_OUTOFMEMORY; } + GetMetaFileBitsEx(mfpict->hMF, data_size, data); /* units are in 1/8th of a point (1 point is 1/72th of an inch) */ meta_place_rec.key = 0x9ac6cdd7; @@ -927,13 +923,12 @@ static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream meta_place_rec.bounding_box[3] = 0; meta_place_rec.checksum = 0; meta_place_rec.reserved = 0; - if (mfpict) - { - /* These values are rounded down so MulDiv won't do the right thing */ - meta_place_rec.bounding_box[2] = (LONGLONG)mfpict->xExt * meta_place_rec.inch / 2540; - meta_place_rec.bounding_box[3] = (LONGLONG)mfpict->yExt * meta_place_rec.inch / 2540; - GlobalUnlock(entry->stgmedium.u.hMetaFilePict); - } + + /* These values are rounded down so MulDiv won't do the right thing */ + meta_place_rec.bounding_box[2] = (LONGLONG)mfpict->xExt * meta_place_rec.inch / 2540; + meta_place_rec.bounding_box[3] = (LONGLONG)mfpict->yExt * meta_place_rec.inch / 2540; + GlobalUnlock(entry->stgmedium.u.hMetaFilePict); + for (check = (WORD *)&meta_place_rec; check != (WORD *)&meta_place_rec.checksum; check++) meta_place_rec.checksum ^= *check; hr = IStream_Write(stream, &meta_place_rec, sizeof(struct meta_placeable), NULL); @@ -982,7 +977,7 @@ static HRESULT save_emf(DataCacheEntry *entry, BOOL contents, IStream *stream) hr = IStream_Write(stream, data, data_size, NULL); HeapFree(GetProcessHeap(), 0, data); } - else + else if (entry->stgmedium.tymed != TYMED_NULL) { data_size = GetEnhMetaFileBits(entry->stgmedium.u.hEnhMetaFile, 0, NULL); data = HeapAlloc(GetProcessHeap(), 0, sizeof(DWORD) + sizeof(ENHMETAHEADER) + data_size); @@ -991,8 +986,7 @@ static HRESULT save_emf(DataCacheEntry *entry, BOOL contents, IStream *stream) GetEnhMetaFileBits(entry->stgmedium.u.hEnhMetaFile, data_size, data + sizeof(DWORD) + sizeof(ENHMETAHEADER)); memcpy(data + sizeof(DWORD), data + sizeof(DWORD) + sizeof(ENHMETAHEADER), sizeof(ENHMETAHEADER)); data_size += sizeof(DWORD) + sizeof(ENHMETAHEADER); - if (hr == S_OK && data_size) - hr = IStream_Write(stream, data, data_size, NULL); + hr = IStream_Write(stream, data, data_size, NULL); HeapFree(GetProcessHeap(), 0, data); } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index f42ebe2330..fe45c6a73e 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4226,35 +4226,64 @@ static void test_data_cache_save_data(void) { { { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, + { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, + { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, }, - 1, 1, &CLSID_WineTest, + 3, 3, &CLSID_WineTest, { - &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 3, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres001", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres002", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 } } } }, + /* without setting data */ { { + { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, + { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, + }, + 3, 0, &CLSID_WineTest, + { + &CLSID_WineTestOld, 3, { { "\2OlePres000", CF_DIB, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres001", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 }, + { "\2OlePres002", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 } } + } + }, + /* static picture clsids */ + { + { + { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, }, - 1, 1, &CLSID_WineTest, + 1, 1, &CLSID_Picture_Dib, { - &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_METAFILEPICT, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } + } + }, + { + { + { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, + }, + 1, 1, &CLSID_Picture_Metafile, + { + &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } }, { { { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, }, - 1, 1, &CLSID_WineTest, + 1, 1, &CLSID_Picture_EnhMetafile, { - &CLSID_WineTestOld, 1, { { "\2OlePres000", CF_ENHMETAFILE, DVASPECT_CONTENT, 0, NULL, 0 } } + &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } }, + /* static picture clsids without setting any data */ { { { CF_DIB, 0, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }, }, - 1, 1, &CLSID_Picture_Dib, + 1, 0, &CLSID_Picture_Dib, { &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } @@ -4263,7 +4292,7 @@ static void test_data_cache_save_data(void) { { CF_METAFILEPICT, 0, DVASPECT_CONTENT, -1, TYMED_MFPICT }, }, - 1, 1, &CLSID_Picture_Metafile, + 1, 0, &CLSID_Picture_Metafile, { &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } @@ -4272,7 +4301,7 @@ static void test_data_cache_save_data(void) { { CF_ENHMETAFILE, 0, DVASPECT_CONTENT, -1, TYMED_ENHMF }, }, - 1, 1, &CLSID_Picture_EnhMetafile, + 1, 0, &CLSID_Picture_EnhMetafile, { &CLSID_WineTestOld, 1, { { "CONTENTS", -1, 0, 0, NULL, 0 } } } -- 2.12.0

1 0

[PATCH 1/2] ole32: Correctly save the dib format if its data has not been set.
by Huw Davies 14 Dec '17

14 Dec '17

From: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Regression is reported at https://bugs.winehq.org/show_bug.cgi?id=44147 Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 75c961164e..ae05b8e176 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -792,8 +792,14 @@ static void init_stream_header(DataCacheEntry *entry, PresentationDataHeader *he static HRESULT save_dib(DataCacheEntry *entry, BOOL contents, IStream *stream) { HRESULT hr = S_OK; - int data_size = GlobalSize(entry->stgmedium.u.hGlobal); - BITMAPINFO *bmi = GlobalLock(entry->stgmedium.u.hGlobal); + int data_size = 0; + BITMAPINFO *bmi = NULL; + + if (entry->stgmedium.tymed != TYMED_NULL) + { + data_size = GlobalSize(entry->stgmedium.u.hGlobal); + bmi = GlobalLock(entry->stgmedium.u.hGlobal); + } if (!contents) { -- 2.12.0

1 0

[PATCH vkd3d 1/6] tests: Make sure that config.h is included before other headers.
by Józef Kucia 14 Dec '17

14 Dec '17

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_test.h | 3 +-- tests/d3d12.c | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index 7eb72d3a29f2..c66b227d1e74 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -19,6 +19,7 @@ #ifndef __VKD3D_TEST_H #define __VKD3D_TEST_H +#include "vkd3d_common.h" #include <assert.h> #include <inttypes.h> #include <stdarg.h> @@ -27,8 +28,6 @@ #include <stdlib.h> #include <string.h> -#include "vkd3d_common.h" - static void vkd3d_test_main(int argc, char **argv); static const char *vkd3d_test_name; diff --git a/tests/d3d12.c b/tests/d3d12.c index 90f848f1d6a0..caf94d235148 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -36,11 +36,6 @@ typedef int HRESULT; #endif -#include <inttypes.h> -#include <limits.h> -#include <math.h> -#include <time.h> - #define COBJMACROS #define INITGUID #include "vkd3d_test.h" @@ -48,6 +43,11 @@ typedef int HRESULT; #define WIDL_C_INLINE_WRAPPERS #include "d3d12.h" +#include <inttypes.h> +#include <limits.h> +#include <math.h> +#include <time.h> + #ifdef _WIN32 # include "dxgi1_4.h" #else -- 2.13.6

2 11

[PATCH v2] wsdapi/tests: Register an exception with the firewall to avoid a dialog.
by Hans Leidekker 14 Dec '17

14 Dec '17

v2: Include makefile changes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/discovery.c | 140 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 141 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/tests/Makefile.in b/dlls/wsdapi/tests/Makefile.in index cd4b41865c..c1e559e1ab 100644 --- a/dlls/wsdapi/tests/Makefile.in +++ b/dlls/wsdapi/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = wsdapi.dll -IMPORTS = wsdapi ole32 user32 ws2_32 +IMPORTS = wsdapi ole32 oleaut32 user32 ws2_32 advapi32 C_SRCS = \ address.c \ diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index db5947d605..f373510a76 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -27,6 +27,7 @@ #include "initguid.h" #include "objbase.h" #include "wsdapi.h" +#include <netfw.h> typedef struct IWSDiscoveryPublisherNotifyImpl { IWSDiscoveryPublisherNotify IWSDiscoveryPublisherNotify_iface; @@ -276,8 +277,146 @@ static void Publish_tests(void) IWSDiscoveryPublisherNotify_Release(sink2); } +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'w','s','d','a','p','i','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + START_TEST(discovery) { + BOOL firewall_enabled = is_firewall_enabled(); + HRESULT hr; + + if (firewall_enabled) + { + if (!is_process_elevated()) + { + skip("no privileges, skipping tests to avoid firewall dialog\n"); + return; + } + if ((hr = set_firewall(APP_ADD)) != S_OK) + { + skip("can't authorize app in firewall %08x\n", hr); + return; + } + } + CoInitialize(NULL); CreateDiscoveryPublisher_tests(); @@ -285,4 +424,5 @@ START_TEST(discovery) Publish_tests(); CoUninitialize(); + if (firewall_enabled) set_firewall(APP_REMOVE); } -- 2.11.0

2 1

[PATCH] secur32: Add a test for Schannel behaviour with SECPKG_ATTR_NEGOTIATION_INFO query.
by Dmitry Timoshkov 14 Dec '17

14 Dec '17

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/tests/schannel.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index b5ed169a97..21ebb6283f 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -686,6 +686,7 @@ static void test_communication(void) SecPkgContext_ConnectionInfo conn_info; SecPkgContext_KeyInfoA key_info; CERT_CONTEXT *cert; + SecPkgContext_NegotiationInfoA info; SecBufferDesc buffers[2]; SecBuffer *buf; @@ -939,6 +940,9 @@ todo_wine status = pQueryContextAttributesA(&context, SECPKG_ATTR_STREAM_SIZES, &sizes); ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_STREAM_SIZES) failed: %08x\n", status); + status = QueryContextAttributesA(&context, SECPKG_ATTR_NEGOTIATION_INFO, &info); + ok(status == SEC_E_UNSUPPORTED_FUNCTION, "QueryContextAttributesA returned %08x\n", status); + reset_buffers(&buffers[0]); /* Send a simple request so we get data for testing DecryptMessage */ -- 2.15.1

1 0

[PATCH] secur32: Add a test for NTLM behaviour with SECPKG_ATTR_NEGOTIATION_INFO query.
by Dmitry Timoshkov 14 Dec '17

14 Dec '17

... to show that QueryContextAttributes(SECPKG_ATTR_NEGOTIATION_INFO) allocates flat memory block for the PackageInfo structure. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/tests/ntlm.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 355af5ad6f..c060420a3f 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -36,6 +36,29 @@ #include "wine/test.h" +#define NEGOTIATE_BASE_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_EXTENDED_ERROR | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_NEGOTIABLE | \ + SECPKG_FLAG_GSS_COMPATIBLE | \ + SECPKG_FLAG_LOGON ) + +#define NTLM_BASE_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_TOKEN_ONLY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_NEGOTIABLE | \ + SECPKG_FLAG_LOGON ) + static HMODULE secdll; static PSecurityFunctionTableA (SEC_ENTRY * pInitSecurityInterfaceA)(void); static SECURITY_STATUS (SEC_ENTRY * pFreeContextBuffer)(PVOID pv); @@ -797,6 +820,8 @@ static void testAuth(ULONG data_rep, BOOL fake) SspiData client = {{0}}, server = {{0}}; SEC_WINNT_AUTH_IDENTITY_A id; SecPkgContext_Sizes ctxt_sizes; + SecPkgContext_NegotiationInfoA info; + SecPkgInfoA *pi; if(pQuerySecurityPackageInfoA( sec_pkg_name, &pkg_info)!= SEC_E_OK) { @@ -889,6 +914,41 @@ static void testAuth(ULONG data_rep, BOOL fake) "cbBlockSize should be 0 but is %u\n", ctxt_sizes.cbBlockSize); + memset(&info, 0, sizeof(info)); + sec_status = QueryContextAttributesA(&client.ctxt, SECPKG_ATTR_NEGOTIATION_INFO, &info); +todo_wine + ok(sec_status == SEC_E_OK, "QueryContextAttributesA returned %08x\n", sec_status); + + pi = info.PackageInfo; + ok(info.NegotiationState == SECPKG_NEGOTIATION_COMPLETE, "got %u\n", info.NegotiationState); +todo_wine + ok(pi != NULL, "expected non-NULL PackageInfo\n"); + if (pi) + { + UINT expected, got; + char *eob; + + ok(pi->fCapabilities == NTLM_BASE_CAPS || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + SECPKG_FLAG_APPCONTAINER_CHECKS), + "got %08x\n", pi->fCapabilities); + ok(pi->wVersion == 1, "got %u\n", pi->wVersion); + ok(pi->wRPCID == RPC_C_AUTHN_WINNT, "got %u\n", pi->wRPCID); + ok(!lstrcmpA( pi->Name, "NTLM" ), "got %s\n", pi->Name); + + expected = sizeof(*pi) + lstrlenA(pi->Name) + 1 + lstrlenA(pi->Comment) + 1; + got = HeapSize(GetProcessHeap(), 0, pi); + ok(got == expected, "got %u, expected %u\n", got, expected); + eob = (char *)pi + expected; + ok(pi->Name + lstrlenA(pi->Name) < eob, "Name doesn't fit into allocated block\n"); + ok(pi->Comment + lstrlenA(pi->Comment) < eob, "Comment doesn't fit into allocated block\n"); + + sec_status = FreeContextBuffer(pi); + ok(sec_status == SEC_E_OK, "FreeContextBuffer error %#x\n", sec_status); + } + tAuthend: cleanupBuffers(&client); cleanupBuffers(&server); -- 2.15.1

1 0

[PATCH] secur32: Add a test for Negotiate behaviour with SECPKG_ATTR_NEGOTIATION_INFO query.
by Dmitry Timoshkov 14 Dec '17

14 Dec '17

... to show that QueryContextAttributes(SECPKG_ATTR_NEGOTIATION_INFO) allocates flat memory block for the PackageInfo structure. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/tests/negotiate.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/tests/negotiate.c b/dlls/secur32/tests/negotiate.c index a1c430d527..2f1228ced2 100644 --- a/dlls/secur32/tests/negotiate.c +++ b/dlls/secur32/tests/negotiate.c @@ -284,13 +284,16 @@ static void test_authentication(void) memset( &info, 0, sizeof(info) ); status_c = QueryContextAttributesA( &client.ctxt, SECPKG_ATTR_NEGOTIATION_INFO, &info ); - ok( status_c == SEC_E_OK, "pQueryContextAttributesA returned %08x\n", status_c ); + ok( status_c == SEC_E_OK, "QueryContextAttributesA returned %08x\n", status_c ); pi = info.PackageInfo; ok( info.NegotiationState == SECPKG_NEGOTIATION_COMPLETE, "got %u\n", info.NegotiationState ); ok( pi != NULL, "expected non-NULL PackageInfo\n" ); if (pi) { + UINT expected, got; + char *eob; + ok( pi->fCapabilities == NTLM_BASE_CAPS || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || @@ -300,6 +303,19 @@ static void test_authentication(void) ok( pi->wVersion == 1, "got %u\n", pi->wVersion ); ok( pi->wRPCID == RPC_C_AUTHN_WINNT, "got %u\n", pi->wRPCID ); ok( !lstrcmpA( pi->Name, "NTLM" ), "got %s\n", pi->Name ); + + expected = sizeof(*pi) + lstrlenA(pi->Name) + 1 + lstrlenA(pi->Comment) + 1; + got = HeapSize(GetProcessHeap(), 0, pi); +todo_wine + ok( got == expected, "got %u, expected %u\n", got, expected ); + eob = (char *)pi + expected; +todo_wine + ok( pi->Name + lstrlenA(pi->Name) < eob, "Name doesn't fit into allocated block\n" ); +todo_wine + ok( pi->Comment + lstrlenA(pi->Comment) < eob, "Comment doesn't fit into allocated block\n" ); + + status = FreeContextBuffer( pi ); + ok( status == SEC_E_OK, "FreeContextBuffer error %#x\n", status ); } done: -- 2.15.1

1 0

[PATCH] user32/tests: Release window DCs consistently
by Nikolay Sivov 14 Dec '17

14 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/cursoricon.c | 2 ++ dlls/user32/tests/static.c | 1 + dlls/user32/tests/sysparams.c | 3 ++- dlls/user32/tests/win.c | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 61b32e01b6..211376b180 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -1070,6 +1070,8 @@ static void test_LoadImageBitmap(const char * test_desc, HBITMAP hbm) ok(ret == bm.bmHeight, "%s: %d lines were converted, not %d\n", test_desc, ret, bm.bmHeight); ok(color_match(pixel, 0x00ffffff), "%s: Pixel is 0x%08x\n", test_desc, pixel); + + ReleaseDC(NULL, hdc); } static void test_LoadImageFile(const char * test_desc, const unsigned char * image_data, diff --git a/dlls/user32/tests/static.c b/dlls/user32/tests/static.c index 929b50d694..8776c3a9e0 100644 --- a/dlls/user32/tests/static.c +++ b/dlls/user32/tests/static.c @@ -99,6 +99,7 @@ static void test_updates(int style, int flags) HDC hdc = GetDC( hStatic); COLORREF colour = GetPixel( hdc, 10, 10); ok ( colour != 0, "pixel should NOT be painted black!\n"); + ReleaseDC(hStatic, hdc); } if (style != SS_ETCHEDHORZ && style != SS_ETCHEDVERT) exp = 4; diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index fa473c163a..5dd8e58ba5 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2918,7 +2918,8 @@ static void test_GetSystemMetrics( void) trace( "Captionfontchar width %d MenuFont %d,%d CaptionWidth from registry: %d screen %d,%d\n", avcwCaption, tmMenuFont.tmHeight, tmMenuFont.tmExternalLeading, CaptionWidthfromreg, screen.cx, screen.cy); } - ReleaseDC( 0, hdc); + + DeleteDC(hdc); } static void test_EnumDisplaySettings(void) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 6e72cbc28a..db27b6b755 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -5242,6 +5242,7 @@ static void test_scrolldc( HWND parent) if (winetest_debug > 0) dump_region(hrgn); /* clean up */ + ReleaseDC(hwnd1, hdc); DeleteObject(hrgn); DeleteObject(exprgn); DeleteObject(tmprgn); -- 2.15.1

2 1

[PATCH 1/3] comctl32/tests: Rename test file
by Nikolay Sivov 14 Dec '17

14 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/Makefile.in | 2 +- dlls/comctl32/tests/{comboex.c => combo.c} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename dlls/comctl32/tests/{comboex.c => combo.c} (99%) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index 5faf1f88ba..ad298f8a0d 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -4,7 +4,7 @@ IMPORTS = comctl32 ole32 user32 gdi32 advapi32 C_SRCS = \ animate.c \ button.c \ - comboex.c \ + combo.c \ datetime.c \ dpa.c \ header.c \ diff --git a/dlls/comctl32/tests/comboex.c b/dlls/comctl32/tests/combo.c similarity index 99% rename from dlls/comctl32/tests/comboex.c rename to dlls/comctl32/tests/combo.c index fede9174a5..4504ce9710 100644 --- a/dlls/comctl32/tests/comboex.c +++ b/dlls/comctl32/tests/combo.c @@ -594,7 +594,7 @@ static void test_get_set_item(void) DestroyWindow(hComboEx); } -START_TEST(comboex) +START_TEST(combo) { if (!init()) return; -- 2.15.1

1 2

[PATCH] include: Discourage use of 'break' or 'continue' inside __TRY/__EXCEPT
by Alex Henrie 14 Dec '17

14 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- As Stefan discovered earlier this year, the meaning of 'break' and 'continue' is different when compiling with native exceptions: https://www.winehq.org/pipermail/wine-patches/2017-February/158152.html --- include/wine/exception.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/wine/exception.h b/include/wine/exception.h index 5bc4d1c692..8e3f48182f 100644 --- a/include/wine/exception.h +++ b/include/wine/exception.h @@ -61,10 +61,12 @@ extern "C" { * use GetExceptionInformation() and GetExceptionCode() to retrieve the * exception info. * - * Warning: inside a __TRY or __EXCEPT block, 'break' or 'continue' statements - * break out of the current block. You cannot use 'return', 'goto' - * or 'longjmp' to leave a __TRY block, as this will surely crash. - * You can use them to leave a __EXCEPT block though. + * Warning: Inside a __TRY or __EXCEPT block, 'break' or 'continue' statements + * break out of the current block, but avoid using them because they + * won't work when compiling with native exceptions. You cannot use + * 'return', 'goto', or 'longjmp' to leave a __TRY block either, as + * this will surely crash. You can use 'return', 'goto', or 'longjmp' + * to leave an __EXCEPT block though. * * -- AJ */ -- 2.15.1

1 0

Can share rough ETA for Vkd3d repo?
by oscar bg 14 Dec '17

14 Dec '17

Hi, I'm pretty interested in that project, namely in testing it jointly with MoltenVK for Macos to see how well D3D12->Vulkan->Metal goes using jointly these two translators and reporting info to MoltenVK author and possibly providing VKD3D patches to play nicer around possible limitations in MoltenVK.. as you I see in the "coming weeks": We'll be hosting vkd3d, the D3D12->Vulkan library, on winehq.org in its own git repository I'm asking if you can share some ETA.. would be super nice if some code can get posted before end of year to play with it no christmas vacations.. anyway no pressure.. thanks..

3 6

[PATCH] po: Fix some MSI translations.
by Zebediah Figura 14 Dec '17

14 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixed a few instances where [Date] and [Time] were incorrectly translated. Also unfuzzed a few translations where only the punctuation changed. po/ar.po | 16 ++++------------ po/bg.po | 4 +--- po/ca.po | 16 ++++------------ po/cs.po | 16 ++++------------ po/da.po | 16 ++++------------ po/el.po | 4 +--- po/eo.po | 12 +++--------- po/es.po | 16 ++++------------ po/fr.po | 16 ++++------------ po/he.po | 12 +++--------- po/hr.po | 16 ++++------------ po/hu.po | 16 ++++------------ po/it.po | 16 ++++------------ po/ko.po | 16 ++++------------ po/nb_NO.po | 12 ++++++------ po/nl.po | 16 ++++------------ po/pl.po | 12 ++++-------- po/pt_BR.po | 16 ++++------------ po/pt_PT.po | 16 ++++------------ po/ro.po | 16 ++++------------ po/sk.po | 4 +--- po/sl.po | 16 ++++------------ po/sr_RS(a)cyrillic.po | 12 +++--------- po/sr_RS(a)latin.po | 11 +++-------- po/sv.po | 16 ++++------------ po/th.po | 4 +--- po/uk.po | 24 ++++++------------------ po/wa.po | 7 ++----- po/zh_CN.po | 8 ++++---- po/zh_TW.po | 16 ++++------------ 30 files changed, 106 insertions(+), 292 deletions(-) diff --git a/po/ar.po b/po/ar.po index d3d2b04..4470450 100644 --- a/po/ar.po +++ b/po/ar.po @@ -7206,16 +7206,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "الملف:" +msgstr "الملف: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "المجلد:" +msgstr "المجلد: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7288,10 +7284,8 @@ msgid "Extension: [1]" msgstr "الامتدادات فقط" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "ال&خط:" +msgstr "الخط: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7361,10 +7355,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "القرص ممتلئ.\n" +msgstr "{{القرص ممتلئ: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/bg.po b/po/bg.po index ce2fc7b..17151ce 100644 --- a/po/bg.po +++ b/po/bg.po @@ -7355,10 +7355,8 @@ msgid "Extension: [1]" msgstr "" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Шрифт:" +msgstr "Шрифт: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/ca.po b/po/ca.po index 70e8d0e..e759aee 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7224,16 +7224,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Fitxer:" +msgstr "Fitxer: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Carpeta:" +msgstr "Carpeta: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7306,10 +7302,8 @@ msgid "Extension: [1]" msgstr "Només extensions" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Tipus de lletra:" +msgstr "Tipus de lletra: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7379,10 +7373,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "El disc està ple.\n" +msgstr "{{El disc està ple: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/cs.po b/po/cs.po index e1df370..bbaf5b1 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7133,16 +7133,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Soubor:" +msgstr "Soubor: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Složka:" +msgstr "Složka: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7215,10 +7211,8 @@ msgid "Extension: [1]" msgstr "Pouze rozšíření" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "Pí&smo:" +msgstr "Písmo: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7288,10 +7282,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disk je plný.\n" +msgstr "{{Disk je plný: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/da.po b/po/da.po index 7409b8c..e08599d 100644 --- a/po/da.po +++ b/po/da.po @@ -7282,16 +7282,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Fil:" +msgstr "Fil: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Mappe:" +msgstr "Mappe: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7364,10 +7360,8 @@ msgid "Extension: [1]" msgstr "Kun udvidelser" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "Skrifttype&navn:" +msgstr "Skrifttypenavn: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7437,10 +7431,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Diskens plads er opbrugt.\n" +msgstr "{{Diskens plads er opbrugt: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/el.po b/po/el.po index ccca124..1f7afc7 100644 --- a/po/el.po +++ b/po/el.po @@ -7223,10 +7223,8 @@ msgid "Extension: [1]" msgstr "" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Γραμματοσειρά:" +msgstr "Γραμματοσειρά: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/eo.po b/po/eo.po index 42b430b..f41464d 100644 --- a/po/eo.po +++ b/po/eo.po @@ -7078,16 +7078,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Dosiero:" +msgstr "Dosiero: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Dosierujon:" +msgstr "Dosierujon: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7158,10 +7154,8 @@ msgid "Extension: [1]" msgstr "" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Tiparo:" +msgstr "Tiparo: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/es.po b/po/es.po index f1f1209..5dd7c20 100644 --- a/po/es.po +++ b/po/es.po @@ -7292,16 +7292,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Archivo:" +msgstr "Archivo: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Carpeta:" +msgstr "Carpeta: [1[" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7374,10 +7370,8 @@ msgid "Extension: [1]" msgstr "Solamente Extensiones" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Fuente:" +msgstr "Fuente: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7447,10 +7441,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disco lleno.\n" +msgstr "{{Disco lleno: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/fr.po b/po/fr.po index 212f733..ed3acc6 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7236,16 +7236,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Fichier :" +msgstr "Fichier : [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Dossier :" +msgstr "Dossier : [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7318,10 +7314,8 @@ msgid "Extension: [1]" msgstr "Extensions uniquement" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Police :" +msgstr "Police : [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7391,10 +7385,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disque plein.\n" +msgstr "{{Disque plein: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/he.po b/po/he.po index 821b45a..90c2463 100644 --- a/po/he.po +++ b/po/he.po @@ -7425,16 +7425,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "קובץ:" +msgstr "קובץ: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "תיקייה:" +msgstr "תיקייה: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7503,10 +7499,8 @@ msgid "Extension: [1]" msgstr "הרחבות בלבד" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&גופן:" +msgstr "גופן: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/hr.po b/po/hr.po index 74cba01..b563bac 100644 --- a/po/hr.po +++ b/po/hr.po @@ -7207,16 +7207,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Datoteka:" +msgstr "Datoteka: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Mapa:" +msgstr "Mapa: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7289,10 +7285,8 @@ msgid "Extension: [1]" msgstr "Samo ekstenzije" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Font:" +msgstr "Font: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7362,10 +7356,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disk pun.\n" +msgstr "{{Disk pun: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/hu.po b/po/hu.po index dec60c7..465c11c 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7240,16 +7240,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Fájl:" +msgstr "Fájl: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Mappa:" +msgstr "Mappa: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7322,10 +7318,8 @@ msgid "Extension: [1]" msgstr "Csak kiterjesztések" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Betûtípus:" +msgstr "Betûtípus: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7395,10 +7389,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Lemez betelt.\n" +msgstr "{{Lemez betelt: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/it.po b/po/it.po index c655878..ca76487 100644 --- a/po/it.po +++ b/po/it.po @@ -7309,16 +7309,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "File:" +msgstr "File: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Cartella:" +msgstr "Cartella: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7391,10 +7387,8 @@ msgid "Extension: [1]" msgstr "Solo estensioni" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Carattere:" +msgstr "Carattere: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7464,10 +7458,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disco pieno.\n" +msgstr "{{Disco pieno: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/ko.po b/po/ko.po index e3fd873..1d6f95d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -7215,16 +7215,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "파일:" +msgstr "파일: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "폴더:" +msgstr "폴더: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7297,10 +7293,8 @@ msgid "Extension: [1]" msgstr "오직 확장만" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "글꼴(&F):" +msgstr "글꼴: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7370,10 +7364,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "디스크가 꽉 찼습니다.\n" +msgstr "{{디스크가 꽉 찼습니다: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/nb_NO.po b/po/nb_NO.po index 0a6af74..605b7e8 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -7206,7 +7206,7 @@ msgstr "Klasse ID: [1]" #: msi.rc:180 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "AppId: [1]{{, AppType: [2], Brukere: [3], RSN: [4]}" +msgstr "AppId: [1]{{, AppType: [2], Brukere: [3], RSN: [4]}}" #: msi.rc:181 msi.rc:202 msgid "Extension: [1]" @@ -7292,23 +7292,23 @@ msgstr "{{Disken er full: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" -msgstr "Handling [Tid]: [1]. [2]" +msgstr "Handling [Time]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "Meldingstype: [1], Argument: [2]{, [3]" +msgstr "Meldingstype: [1], Argument: [2]{, [3]}" #: msi.rc:81 msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== Logging startet: [Dato] [Tid] ===" +msgstr "=== Logging startet: [Date] [Time] ===" #: msi.rc:79 msgid "Action start [Time]: [1]." -msgstr "Handling startet [Tid]: [1]." +msgstr "Handling startet [Time]: [1]." #: msi.rc:80 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "Handling avsluttet [Tid]: [1]. Returnert verdi [2]." +msgstr "Handling avsluttet [Time]: [1]. Returnert verdi [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" diff --git a/po/nl.po b/po/nl.po index e77a25f..fce7d55 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7283,16 +7283,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Bestandsnaam:" +msgstr "Bestandsnaam: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Map:" +msgstr "Map: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7365,10 +7361,8 @@ msgid "Extension: [1]" msgstr "Alleen extensies" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Lettertype:" +msgstr "Lettertype: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7438,10 +7432,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Schijf vol.\n" +msgstr "{{Schijf vol: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/pl.po b/po/pl.po index 9be7f17..080ac52 100644 --- a/po/pl.po +++ b/po/pl.po @@ -7303,7 +7303,7 @@ msgstr "{{Pełny dysk: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" -msgstr "Działanie [Czas]: [1]. [2]" +msgstr "Działanie [Time]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" @@ -7311,19 +7311,15 @@ msgstr "Rodzaj wiadomości: [1], Argument: [2]{, [3]}" #: msi.rc:81 msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== Rozpoczęcie zbierania logów: [Data] [Czas] ===" +msgstr "=== Rozpoczęcie zbierania logów: [Date] [Time] ===" #: msi.rc:79 -#, fuzzy -#| msgid "Action start %s: [1]." msgid "Action start [Time]: [1]." -msgstr "Rozpoczęcie działania %s: [1]." +msgstr "Rozpoczęcie działania [Time]: [1]." #: msi.rc:80 -#, fuzzy -#| msgid "Action ended %s: [1]. Return value [2]." msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "Zakończono działanie %s: [1]. Zwrócona wartość [2]." +msgstr "Zakończono działanie [Time]: [1]. Zwrócona wartość [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" diff --git a/po/pt_BR.po b/po/pt_BR.po index da5331b..4c68078 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7218,16 +7218,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Arquivo:" +msgstr "Arquivo: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Pasta:" +msgstr "Pasta: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7300,10 +7296,8 @@ msgid "Extension: [1]" msgstr "Extensões Apenas" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Fonte:" +msgstr "Fonte: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7373,10 +7367,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disco cheio.\n" +msgstr "{{Disco cheio: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/pt_PT.po b/po/pt_PT.po index 14bc931..4231df7 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -7185,16 +7185,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Ficheiro:" +msgstr "Ficheiro: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Pasta:" +msgstr "Pasta: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7267,10 +7263,8 @@ msgid "Extension: [1]" msgstr "Extensões Apenas" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Tipo de Letra:" +msgstr "Tipo de Letra: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7340,10 +7334,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disco cheio.\n" +msgstr "{{Disco cheio: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/ro.po b/po/ro.po index 234fee4..994a182 100644 --- a/po/ro.po +++ b/po/ro.po @@ -7237,16 +7237,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Fișier:" +msgstr "Fișier: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Dosar:" +msgstr "Dosar: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7319,10 +7315,8 @@ msgid "Extension: [1]" msgstr "Doar extensii" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Font:" +msgstr "Font: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7392,10 +7386,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disc plin.\n" +msgstr "{{Disc plin: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/sk.po b/po/sk.po index 0f89f03..7881943 100644 --- a/po/sk.po +++ b/po/sk.po @@ -7240,10 +7240,8 @@ msgid "Extension: [1]" msgstr "" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Písmo:" +msgstr "Písmo: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/sl.po b/po/sl.po index 299b8c4..b9a757a 100644 --- a/po/sl.po +++ b/po/sl.po @@ -7301,16 +7301,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Datoteka:" +msgstr "Datoteka: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Mapa:" +msgstr "Mapa: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7383,10 +7379,8 @@ msgid "Extension: [1]" msgstr "Le razširitve" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "Pis&ava:" +msgstr "Pisava: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7456,10 +7450,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disk je poln.\n" +msgstr "{{Disk je poln: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/sr_RS(a)cyrillic.po b/po/sr_RS(a)cyrillic.po index b893066..d0d41c7 100644 --- a/po/sr_RS(a)cyrillic.po +++ b/po/sr_RS(a)cyrillic.po @@ -7460,16 +7460,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Датотека:" +msgstr "Датотека: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Фасцикла:" +msgstr "Фасцикла: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7536,10 +7532,8 @@ msgid "Extension: [1]" msgstr "" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Фонт:" +msgstr "Фонт: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/sr_RS(a)latin.po b/po/sr_RS(a)latin.po index c1242f7..a1d6d5e 100644 --- a/po/sr_RS(a)latin.po +++ b/po/sr_RS(a)latin.po @@ -7565,16 +7565,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Datoteka:" +msgstr "Datoteka: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Fascikla:" +msgstr "Fascikla: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7645,9 +7641,8 @@ msgid "Extension: [1]" msgstr "" #: msi.rc:182 msi.rc:203 -#, fuzzy msgid "Font: [1]" -msgstr "Fontovi" +msgstr "Fontovi: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/sv.po b/po/sv.po index 8b83123..0b2f1b3 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7201,16 +7201,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "Fil:" +msgstr "Fil: [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "Mapp:" +msgstr "Mapp: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7283,10 +7279,8 @@ msgid "Extension: [1]" msgstr "Enbart tillägg" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Typsnitt:" +msgstr "Typsnitt: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7356,10 +7350,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Disken är full.\n" +msgstr "{{Disken är full: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" diff --git a/po/th.po b/po/th.po index c23a804..49bc87f 100644 --- a/po/th.po +++ b/po/th.po @@ -7237,10 +7237,8 @@ msgid "Extension: [1]" msgstr "" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "ต้วอักษร:" +msgstr "ต้วอักษร: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/uk.po b/po/uk.po index 1d3c26c..82449e9 100644 --- a/po/uk.po +++ b/po/uk.po @@ -7310,9 +7310,7 @@ msgid "Warning [1]." msgstr "" #: msi.rc:74 -#, fuzzy -#| msgid "Info [1]. " -msgid "Info [1]." +msgid "Info [1]. " msgstr "Інфо [1]. " #: msi.rc:75 @@ -7323,38 +7321,28 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "Диск заповнений.\n" +msgstr "{{Диск заповнений: }}" #: msi.rc:77 -#, fuzzy -#| msgid "Action %s: [1]. [2]" msgid "Action [Time]: [1]. [2]" -msgstr "Дія %s: [1]. [2]" +msgstr "Дія [Time]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" msgstr "Тип повідомлення: [1], Аргумент: [2]{, [3]}" #: msi.rc:81 -#, fuzzy -#| msgid "=== Logging started: %s %s ===" msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== Журналювання розпочалося: %s %s ===" +msgstr "=== Журналювання розпочалося: [Date] [Time] ===" #: msi.rc:79 -#, fuzzy -#| msgid "Action start %s: [1]." msgid "Action start [Time]: [1]." -msgstr "Запуск дії %s: [1]." +msgstr "Запуск дії [Time]: [1]." #: msi.rc:80 -#, fuzzy -#| msgid "Action ended %s: [1]. Return value [2]." msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "Дія завершилася %s: [1]. Повернене значення [2]." +msgstr "Дія завершилася [Time]: [1]. Повернене значення [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" diff --git a/po/wa.po b/po/wa.po index 1dbb9a3..b42f9ad 100644 --- a/po/wa.po +++ b/po/wa.po @@ -7112,9 +7112,8 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy msgid "File: [1]" -msgstr "&Fitchî" +msgstr "Fitchî: [1]" #: msi.rc:163 msi.rc:190 msgid "Folder: [1]" @@ -7183,10 +7182,8 @@ msgid "Extension: [1]" msgstr "" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "&Fonte:" +msgstr "Fonte: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" diff --git a/po/zh_CN.po b/po/zh_CN.po index 024f83e..92ecbf9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7229,7 +7229,7 @@ msgstr "{{磁盘已满：}}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" -msgstr "操作 [时间]：[1]。[2]" +msgstr "操作 [Time]：[1]。[2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" @@ -7237,15 +7237,15 @@ msgstr "消息类型：[1]，参数：[2]{, [3]}" #: msi.rc:81 msgid "=== Logging started: [Date] [Time] ===" -msgstr "=== 日志开头：[日期] [时间] ===" +msgstr "=== 日志开头：[Date] [Time] ===" #: msi.rc:79 msgid "Action start [Time]: [1]." -msgstr "操作开始 [时间]：[1]。" +msgstr "操作开始 [Time]：[1]。" #: msi.rc:80 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "操作结束 [时间]：[1]。返回值 [2]。" +msgstr "操作结束 [Time]：[1]。返回值 [2]。" #: msi.rc:83 msgid "Please insert the disk: [2]" diff --git a/po/zh_TW.po b/po/zh_TW.po index 5d97f35..a210515 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7176,16 +7176,12 @@ msgid "Property: [1], Signature: [2]" msgstr "" #: msi.rc:162 -#, fuzzy -#| msgid "File:" msgid "File: [1]" -msgstr "檔案：" +msgstr "檔案： [1]" #: msi.rc:163 msi.rc:190 -#, fuzzy -#| msgid "Folder:" msgid "Folder: [1]" -msgstr "資料夾:" +msgstr "資料夾: [1]" #: msi.rc:164 msi.rc:193 msgid "Shortcut: [1]" @@ -7258,10 +7254,8 @@ msgid "Extension: [1]" msgstr "只有進階屬性" #: msi.rc:182 msi.rc:203 -#, fuzzy -#| msgid "&Font:" msgid "Font: [1]" -msgstr "字型(&F)：" +msgstr "字型： [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" @@ -7331,10 +7325,8 @@ msgid "" msgstr "" #: msi.rc:76 -#, fuzzy -#| msgid "Disk full.\n" msgid "{{Disk full: }}" -msgstr "磁碟已滿。\n" +msgstr "{{磁碟已滿： }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" -- 2.7.4

1 0

[PATCH] dplayx/tests: Remove the firewall exception after running the tests.
by Hans Leidekker 13 Dec '17

13 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/dplayx/tests/dplayx.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 0786d166a5..f4e7301da7 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -6951,7 +6951,7 @@ START_TEST(dplayx) if (!winetest_interactive) { skip("Run in interactive mode to run all dplayx tests.\n"); - return; + goto done; } trace("Running in interactive mode, tests will take a while\n"); @@ -6991,6 +6991,8 @@ START_TEST(dplayx) test_remote_data_replication(); test_host_migration(); +done: FreeLibrary(module); CoUninitialize(); + if (firewall_enabled) set_firewall(APP_REMOVE); } -- 2.11.0

2 1

[PATCH 3/3] include: Remove some superfluous semicolons.
by Henri Verbeet 13 Dec '17

13 Dec '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- include/access.idl | 2 +- include/amstream.idl | 2 +- include/asptlb.idl | 2 +- include/audiopolicy.idl | 12 +++---- include/axextend.idl | 8 ++--- include/bits3_0.idl | 2 +- include/cmdbas.idl | 2 +- include/cmdtxt.idl | 2 +- include/comsvcs.idl | 2 +- include/cordebug.idl | 76 ++++++++++++++++++++-------------------- include/d3d10sdklayers.idl | 2 +- include/d3dx10core.idl | 6 ++-- include/d3dx11core.idl | 6 ++-- include/devicetopology.idl | 2 +- include/docobjectservice.idl | 2 +- include/dwrite.idl | 2 +- include/dwrite_1.idl | 18 +++++----- include/dwrite_2.idl | 2 +- include/dxva2api.idl | 12 +++---- include/iads.idl | 10 +++--- include/mediaobj.idl | 2 +- include/metahost.idl | 4 +-- include/mfreadwrite.idl | 4 +-- include/mftransform.idl | 2 +- include/mlang.idl | 2 +- include/mscoree.idl | 2 +- include/msdadc.idl | 4 +-- include/msinkaut.idl | 40 ++++++++++----------- include/mstask.idl | 4 +-- include/msxml2.idl | 78 ++++++++++++++++++++--------------------- include/msxml6.idl | 82 ++++++++++++++++++++++---------------------- include/netcfgx.idl | 8 ++--- include/netcon.idl | 2 +- include/oleacc.idl | 2 +- include/pstore.idl | 2 +- include/qedit.idl | 24 ++++++------- include/shdeprecated.idl | 8 ++--- include/shobjidl.idl | 2 +- include/stdole2.idl | 16 ++++----- include/textstor.idl | 4 +-- include/transact.idl | 14 ++++---- include/txcoord.idl | 28 +++++++-------- include/txdtc.idl | 76 ++++++++++++++++++++-------------------- include/urlmon.idl | 2 +- include/vmr9.idl | 28 +++++++-------- include/vmrender.idl | 28 +++++++-------- include/wbemcli.idl | 12 +++---- include/wbemdisp.idl | 38 ++++++++++---------- include/wincodec.idl | 4 +-- include/wmdrmsdk.idl | 4 +-- include/wmiutils.idl | 6 ++-- include/wmsbuffer.idl | 2 +- include/wmsdkidl.idl | 44 ++++++++++++------------ include/wsdxml.idl | 2 +- 54 files changed, 376 insertions(+), 376 deletions(-) diff --git a/include/access.idl b/include/access.idl index a1585f2..5ade09b 100644 --- a/include/access.idl +++ b/include/access.idl @@ -80,4 +80,4 @@ interface IAccessor : IUnknown [in, out, unique] DBREFCOUNT *pcRefCount, [out] IErrorInfo **ppErrorInfoRem); -}; +} diff --git a/include/amstream.idl b/include/amstream.idl index d4e5e35..36e7793 100644 --- a/include/amstream.idl +++ b/include/amstream.idl @@ -79,7 +79,7 @@ interface IDirectShowStream : IDispatch [propput, id(2), helpstring("property Video")] HRESULT Video([in] OUTPUT_STATE newVal); [propget, id(3), helpstring("property Audio")] HRESULT Audio([out, retval] OUTPUT_STATE *pVal); [propput, id(3), helpstring("property Audio")] HRESULT Audio([in] OUTPUT_STATE newVal); -}; +} [ object, diff --git a/include/asptlb.idl b/include/asptlb.idl index d010908..b38bc5d 100644 --- a/include/asptlb.idl +++ b/include/asptlb.idl @@ -38,7 +38,7 @@ interface IRequestDictionary : IDispatch [propget] HRESULT Key([in] VARIANT key, [retval, out] VARIANT *value); -}; +} [ object, diff --git a/include/audiopolicy.idl b/include/audiopolicy.idl index d1832bb..6299c9d 100644 --- a/include/audiopolicy.idl +++ b/include/audiopolicy.idl @@ -144,7 +144,7 @@ interface IAudioSessionControl2 : IAudioSessionControl HRESULT SetDuckingPreferences( [in] BOOL optOut ); -}; +} [ local, @@ -164,7 +164,7 @@ interface IAudioSessionManager : IUnknown [in] DWORD StreamFlags, [out] ISimpleAudioVolume **AudioVolume ); -}; +} [ local, @@ -181,7 +181,7 @@ interface IAudioVolumeDuckNotification : IUnknown HRESULT OnVolumeUnduckNotification( [in] LPCWSTR sessionID ); -}; +} [ local, @@ -194,7 +194,7 @@ interface IAudioSessionNotification : IUnknown HRESULT OnSessionCreated( [in] IAudioSessionControl *NewSession ); -}; +} [ local, @@ -211,7 +211,7 @@ interface IAudioSessionEnumerator : IUnknown [in] INT SessionCount, [out] IAudioSessionControl **Session ); -}; +} [ local, @@ -237,4 +237,4 @@ interface IAudioSessionManager2 : IAudioSessionManager HRESULT UnregisterDuckNotification( [in] IAudioVolumeDuckNotification *duckNotification ); -}; +} diff --git a/include/axextend.idl b/include/axextend.idl index 63eb542..ae891c7 100644 --- a/include/axextend.idl +++ b/include/axextend.idl @@ -851,7 +851,7 @@ interface IAMCertifiedOutputProtection : IUnknown HRESULT ProtectionStatus( [in] const AMCOPPStatusInput* pStatusInput, [out] AMCOPPStatusOutput* pStatusOutput); -}; +} enum _AM_RENSDEREXFLAGS { @@ -1246,7 +1246,7 @@ enum _AM_FILTER_MISC_FLAGS interface IAMFilterMiscFlags : IUnknown { ULONG GetMiscFlags(); -}; +} [ local, @@ -1261,7 +1261,7 @@ interface IAMGraphBuilderCallback : IUnknown HRESULT CreatedFilter( [in] IBaseFilter *pFil); -}; +} [ local, @@ -1281,4 +1281,4 @@ interface IAMVfwCaptureDialogs : IUnknown [in] int msg, [in] long data1, [in] long data2); -}; +} diff --git a/include/bits3_0.idl b/include/bits3_0.idl index cb6c309..4c786e6 100644 --- a/include/bits3_0.idl +++ b/include/bits3_0.idl @@ -50,7 +50,7 @@ cpp_quote("#define BG_JOB_DISABLE_BRANCH_CACHE 0x0004") HRESULT GetOwnerElevationState([out, ref] BOOL *elevated); HRESULT SetMaximumDownloadTime(ULONG timeout); HRESULT GetMaximumDownloadTime([out,ref] ULONG *timeout); -}; +} [ uuid(659cdea6-489e-11d9-a9cd-000d56965251), diff --git a/include/cmdbas.idl b/include/cmdbas.idl index 5ac9bb4..129c317 100644 --- a/include/cmdbas.idl +++ b/include/cmdbas.idl @@ -63,4 +63,4 @@ interface ICommand : IUnknown HRESULT RemoteGetDBSession([in] REFIID riid, [out, iid_is(riid)] IUnknown **ppSession, [out] IErrorInfo **ppErrorInfoRem); -}; +} diff --git a/include/cmdtxt.idl b/include/cmdtxt.idl index 1d68d7a..6df8ae8 100644 --- a/include/cmdtxt.idl +++ b/include/cmdtxt.idl @@ -45,4 +45,4 @@ interface ICommandText : ICommand [in, unique] LPCOLESTR pwszCommand, [out] IErrorInfo **ppErrorInfoRem); -}; +} diff --git a/include/comsvcs.idl b/include/comsvcs.idl index 2c510f8..d64af1f 100644 --- a/include/comsvcs.idl +++ b/include/comsvcs.idl @@ -96,4 +96,4 @@ library COMSVCSLib { [default] interface IDispenserManager; }; -}; +} diff --git a/include/cordebug.idl b/include/cordebug.idl index 0488fd9..225f726 100644 --- a/include/cordebug.idl +++ b/include/cordebug.idl @@ -149,7 +149,7 @@ interface ICorDebugValue : IUnknown HRESULT GetSize([out] ULONG32 *pSize); HRESULT GetAddress([out] CORDB_ADDRESS *pAddress); HRESULT CreateBreakpoint([out] ICorDebugValueBreakpoint **ppBreakpoint); -}; +} [ object, @@ -189,7 +189,7 @@ interface ICorDebugThread : IUnknown HRESULT GetRegisterSet([out] ICorDebugRegisterSet **ppRegisters); HRESULT CreateEval([out] ICorDebugEval **ppEval); HRESULT GetObject([out] ICorDebugValue **ppObject); -}; +} [ object, @@ -216,7 +216,7 @@ interface ICorDebugController : IUnknown HRESULT CommitChanges([in] ULONG cSnapshots, [in] ICorDebugEditAndContinueSnapshot *pSnapshots[], [out] ICorDebugErrorInfoEnum **pError); -}; +} [ object, @@ -245,7 +245,7 @@ interface ICorDebugProcess : ICorDebugController HRESULT GetObject([out] ICorDebugValue **ppObject); HRESULT ThreadForFiberCookie([in] DWORD fiberCookie, [out] ICorDebugThread **ppThread); HRESULT GetHelperThreadID([out] DWORD *pThreadID); -}; +} [ object, @@ -266,7 +266,7 @@ interface ICorDebugAppDomain : ICorDebugController HRESULT GetObject([out] ICorDebugValue **ppObject); HRESULT Attach(); HRESULT GetID([out] ULONG32 *pId); -}; +} [ object, @@ -354,7 +354,7 @@ interface ICorDebugManagedCallback : IUnknown HRESULT BreakpointSetError([in] ICorDebugAppDomain *pAppDomain, [in] ICorDebugThread *pThread, [in] ICorDebugBreakpoint *pBreakpoint, [in] DWORD dwError); -}; +} [ object, @@ -410,7 +410,7 @@ interface ICorDebugManagedCallback2 : IUnknown [in] ICorDebugThread *pThread, [in] ICorDebugMDA * pMDA ); -}; +} [ object, local, @@ -438,7 +438,7 @@ interface ICorDebug : IUnknown HRESULT EnumerateProcesses([out] ICorDebugProcessEnum **ppProcess); HRESULT GetProcess([in] DWORD dwProcessId, [out] ICorDebugProcess **ppProcess); HRESULT CanLaunchOrAttach([in] DWORD dwProcessId, [in] BOOL win32DebuggingEnabled); -}; +} [ @@ -451,7 +451,7 @@ interface ICorDebugBreakpoint : IUnknown { HRESULT Activate([in] BOOL bActive); HRESULT IsActive([out] BOOL *pbActive); -}; +} [ object, @@ -463,7 +463,7 @@ interface ICorDebugFunctionBreakpoint : ICorDebugBreakpoint { HRESULT GetFunction([out] ICorDebugFunction **ppFunction); HRESULT GetOffset([out] ULONG32 *pnOffset); -}; +} [ object, @@ -474,7 +474,7 @@ interface ICorDebugFunctionBreakpoint : ICorDebugBreakpoint interface ICorDebugModuleBreakpoint : ICorDebugBreakpoint { HRESULT GetModule([out] ICorDebugModule **ppModule); -}; +} [ object, @@ -485,7 +485,7 @@ interface ICorDebugModuleBreakpoint : ICorDebugBreakpoint interface ICorDebugValueBreakpoint : ICorDebugBreakpoint { HRESULT GetValue([out] ICorDebugValue **ppValue); -}; +} [ object, @@ -535,7 +535,7 @@ interface ICorDebugStepper : IUnknown HRESULT StepRange([in] BOOL bStepIn, [in] COR_DEBUG_STEP_RANGE ranges[], [in] ULONG32 cRangeCount); HRESULT StepOut(); HRESULT SetRangeIL([in] BOOL bIL); -}; +} [ object, @@ -549,7 +549,7 @@ interface ICorDebugEnum : IUnknown HRESULT Reset(); HRESULT Clone([out] ICorDebugEnum **ppEnum); HRESULT GetCount([out] ULONG *pcelt); -}; +} [ object, @@ -562,7 +562,7 @@ interface ICorDebugAppDomainEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugAppDomain *values[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -574,7 +574,7 @@ interface ICorDebugAssemblyEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugAssembly *values[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -585,7 +585,7 @@ interface ICorDebugAssemblyEnum : ICorDebugEnum interface ICorDebugBreakpointEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugBreakpoint *breakpoints[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -596,7 +596,7 @@ interface ICorDebugBreakpointEnum : ICorDebugEnum interface ICorDebugChainEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugChain *chains[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -608,7 +608,7 @@ interface ICorDebugErrorInfoEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugEditAndContinueErrorInfo *errors[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -619,7 +619,7 @@ interface ICorDebugErrorInfoEnum : ICorDebugEnum interface ICorDebugFrameEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugFrame *frames[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -630,7 +630,7 @@ interface ICorDebugFrameEnum : ICorDebugEnum interface ICorDebugModuleEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugModule *modules[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -641,7 +641,7 @@ interface ICorDebugModuleEnum : ICorDebugEnum interface ICorDebugObjectEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] CORDB_ADDRESS objects[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -652,7 +652,7 @@ interface ICorDebugObjectEnum : ICorDebugEnum interface ICorDebugProcessEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugProcess *processes[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -663,7 +663,7 @@ interface ICorDebugProcessEnum : ICorDebugEnum interface ICorDebugStepperEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugStepper *steppers[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -674,7 +674,7 @@ interface ICorDebugStepperEnum : ICorDebugEnum interface ICorDebugThreadEnum : ICorDebugEnum { HRESULT Next([in] ULONG celt, [out] ICorDebugThread *threads[], [out] ULONG *pceltFetched); -}; +} [ object, @@ -713,7 +713,7 @@ interface ICorDebugChain : IUnknown } CorDebugChainReason; HRESULT GetReason([out] CorDebugChainReason *pReason); -}; +} [ object, @@ -731,7 +731,7 @@ interface ICorDebugFrame : IUnknown HRESULT GetCaller([out] ICorDebugFrame **ppFrame); HRESULT GetCallee([out] ICorDebugFrame **ppFrame); HRESULT CreateStepper([out] ICorDebugStepper **ppStepper); -}; +} [ @@ -846,7 +846,7 @@ interface ICorDebugEval : IUnknown HRESULT GetThread([out] ICorDebugThread **ppThread); HRESULT CreateValue([in] CorElementType elementType, [in] ICorDebugClass *pElementClass, [out] ICorDebugValue **ppValue); -}; +} [ object, @@ -863,7 +863,7 @@ interface ICorDebugEditAndContinueSnapshot : IUnknown HRESULT SetPEBytes([in] IStream *pIStream); HRESULT SetILMap([in] mdToken mdFunction, [in] ULONG cMapSize, [in] COR_IL_MAP map[]); HRESULT SetPESymbolBytes([in] IStream *pIStream); -}; +} [ object, @@ -890,7 +890,7 @@ interface ICorDebugModule : IUnknown HRESULT GetGlobalVariableValue([in] mdFieldDef fieldDef, [out] ICorDebugValue **ppValue); HRESULT GetSize([out] ULONG32 *pcBytes); HRESULT IsInMemory([out] BOOL *pInMemory); -}; +} [ object, @@ -904,7 +904,7 @@ interface ICorDebugClass : IUnknown HRESULT GetToken([out] mdTypeDef *pTypeDef); HRESULT GetStaticFieldValue([in] mdFieldDef fieldDef, [in] ICorDebugFrame *pFrame, [out] ICorDebugValue **ppValue); -}; +} [ object, @@ -919,7 +919,7 @@ interface ICorDebugAssembly : IUnknown HRESULT EnumerateModules([out] ICorDebugModuleEnum **ppModules); HRESULT GetCodeBase([in] ULONG32 cchName, [out] ULONG32 *pcchName, [out] WCHAR szName[]); HRESULT GetName([in] ULONG32 cchName, [out] ULONG32 *pcchName, [out] WCHAR szName[]); -}; +} [ @@ -938,7 +938,7 @@ interface ICorDebugFunction : IUnknown HRESULT CreateBreakpoint([out] ICorDebugFunctionBreakpoint **ppBreakpoint); HRESULT GetLocalVarSigToken([out] mdSignature *pmdSig); HRESULT GetCurrentVersionNumber([out] ULONG32 *pnCurrentVersion); -}; +} [ object, @@ -949,7 +949,7 @@ interface ICorDebugFunction : IUnknown interface ICorDebugUnmanagedCallback : IUnknown { HRESULT DebugEvent([in] LPDEBUG_EVENT pDebugEvent, [in] BOOL fOutOfBand); -}; +} [ object, @@ -982,7 +982,7 @@ interface ICorDebugObjectValue : ICorDebugValue HRESULT IsValueClass([out] BOOL *pbIsValueClass); HRESULT GetManagedCopy([out] IUnknown **ppObject); HRESULT SetFromManagedCopy([in] IUnknown *pObject); -}; +} [ object, @@ -992,7 +992,7 @@ interface ICorDebugObjectValue : ICorDebugValue ] interface ICorDebugContext : ICorDebugObjectValue { -}; +} [ object, @@ -1014,7 +1014,7 @@ interface ICorDebugCode : IUnknown [out] COR_DEBUG_IL_TO_NATIVE_MAP map[]); HRESULT GetEnCRemapSequencePoints([in] ULONG32 cMap,[out] ULONG32 *pcMap, [out] ULONG32 offsets[]); -}; +} [ object, @@ -1038,4 +1038,4 @@ interface ICorDebugMDA : IUnknown HRESULT GetFlags([in] CorDebugMDAFlags * pFlags); HRESULT GetOSThreadId([out] DWORD * pOsTid); -}; +} diff --git a/include/d3d10sdklayers.idl b/include/d3d10sdklayers.idl index be00876..c6606d2 100644 --- a/include/d3d10sdklayers.idl +++ b/include/d3d10sdklayers.idl @@ -673,4 +673,4 @@ interface ID3D10InfoQueue : IUnknown [in] BOOL mute ); BOOL GetMuteDebugOutput(); -}; +} diff --git a/include/d3dx10core.idl b/include/d3dx10core.idl index 40d132c..c99ab82 100644 --- a/include/d3dx10core.idl +++ b/include/d3dx10core.idl @@ -31,7 +31,7 @@ interface ID3DX10DataLoader HRESULT Load(); HRESULT Decompress([out] void **data, [in] SIZE_T *bytes); HRESULT Destroy(); -}; +} [ object, @@ -43,7 +43,7 @@ interface ID3DX10DataProcessor HRESULT Process([in] void *data, [in] SIZE_T bytes); HRESULT CreateDeviceObject([out] void **dataobject); HRESULT Destroy(); -}; +} [ @@ -63,7 +63,7 @@ interface ID3DX10ThreadPump : IUnknown HRESULT PurgeAllItems(); HRESULT GetQueueStatus([in] UINT *queue, [in] UINT *processqueue, [in] UINT *devicequeue); -}; +} cpp_quote("HRESULT WINAPI D3DX10UnsetAllDeviceObjects(ID3D10Device *device);") cpp_quote("HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type,") diff --git a/include/d3dx11core.idl b/include/d3dx11core.idl index d47463c..f619e3b 100644 --- a/include/d3dx11core.idl +++ b/include/d3dx11core.idl @@ -31,7 +31,7 @@ interface ID3DX11DataLoader HRESULT Load(); HRESULT Decompress([out] void **data, [in] SIZE_T *bytes); HRESULT Destroy(); -}; +} [ object, @@ -43,7 +43,7 @@ interface ID3DX11DataProcessor HRESULT Process([in] void *data, [in] SIZE_T bytes); HRESULT CreateDeviceObject([out] void **data_object); HRESULT Destroy(); -}; +} [ object, @@ -62,4 +62,4 @@ interface ID3DX11ThreadPump : IUnknown HRESULT PurgeAllItems(); HRESULT GetQueueStatus([in] UINT *io_queue, [in] UINT *process_queue, [in] UINT *device_queue); -}; +} diff --git a/include/devicetopology.idl b/include/devicetopology.idl index 3ff3027..7e89d54 100644 --- a/include/devicetopology.idl +++ b/include/devicetopology.idl @@ -604,7 +604,7 @@ interface IPart : IUnknown HRESULT UnregisterControlChangeCallback( [in] IControlChangeNotify *pNotify ); -}; +} [ pointer_default(unique), diff --git a/include/docobjectservice.idl b/include/docobjectservice.idl index 7478551..4e93135 100644 --- a/include/docobjectservice.idl +++ b/include/docobjectservice.idl @@ -64,4 +64,4 @@ interface IDocObjectService : IUnknown HRESULT IsErrorUrl( [in] LPCWSTR lpszUrl, [out] BOOL *pfIsError); -}; +} diff --git a/include/dwrite.idl b/include/dwrite.idl index 115f958..e6ab2b7 100644 --- a/include/dwrite.idl +++ b/include/dwrite.idl @@ -620,7 +620,7 @@ interface IDWriteFontFileEnumerator : IUnknown { HRESULT MoveNext(BOOL *has_current_file); HRESULT GetCurrentFontFile(IDWriteFontFile **font_file); -}; +} [ local, diff --git a/include/dwrite_1.idl b/include/dwrite_1.idl index 4015c12..c00e922 100644 --- a/include/dwrite_1.idl +++ b/include/dwrite_1.idl @@ -584,7 +584,7 @@ interface IDWriteFactory1 : IDWriteFactory DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE mode, IDWriteRenderingParams1** params); -}; +} [ local, @@ -633,7 +633,7 @@ interface IDWriteFontFace1 : IDWriteFontFace const UINT16 *nominal_indices, UINT16 *vertical_indices); BOOL HasVerticalGlyphVariants(); -}; +} [ local, @@ -648,7 +648,7 @@ interface IDWriteFont1 : IDWriteFont DWRITE_UNICODE_RANGE *ranges, UINT32 *count); BOOL IsMonospacedFont(); -}; +} [ local, @@ -658,7 +658,7 @@ uuid(94413cf4-a6fc-4248-8b50-6674348fcad3) interface IDWriteRenderingParams1 : IDWriteRenderingParams { FLOAT GetGrayscaleEnhancedContrast(); -}; +} [ local, @@ -744,7 +744,7 @@ interface IDWriteTextAnalyzer1 : IDWriteTextAnalyzer UINT16 *modified_indices, FLOAT *modified_advances, DWRITE_GLYPH_OFFSET *modified_offsets); -}; +} [ local, @@ -758,7 +758,7 @@ interface IDWriteTextAnalysisSource1 : IDWriteTextAnalysisSource UINT32 *length, DWRITE_VERTICAL_GLYPH_ORIENTATION *orientation, UINT8 *bidi_level); -}; +} [ local, @@ -774,7 +774,7 @@ interface IDWriteTextAnalysisSink1 : IDWriteTextAnalysisSink UINT8 adjusted_bidilevel, BOOL is_sideways, BOOL is_rtl); -}; +} [ local, @@ -804,7 +804,7 @@ interface IDWriteTextLayout1 : IDWriteTextLayout FLOAT* trailing_spacing, FLOAT* minimum_advance_width, [defaultvalue(NULL)] DWRITE_TEXT_RANGE *range); -}; +} typedef enum DWRITE_TEXT_ANTIALIAS_MODE { @@ -821,4 +821,4 @@ interface IDWriteBitmapRenderTarget1 : IDWriteBitmapRenderTarget { DWRITE_TEXT_ANTIALIAS_MODE GetTextAntialiasMode(); HRESULT SetTextAntialiasMode(DWRITE_TEXT_ANTIALIAS_MODE mode); -}; +} diff --git a/include/dwrite_2.idl b/include/dwrite_2.idl index d2960eb..5401cf3 100644 --- a/include/dwrite_2.idl +++ b/include/dwrite_2.idl @@ -288,7 +288,7 @@ interface IDWriteColorGlyphRunEnumerator : IUnknown interface IDWriteRenderingParams2 : IDWriteRenderingParams1 { DWRITE_GRID_FIT_MODE GetGridFitMode(); -}; +} [ local, diff --git a/include/dxva2api.idl b/include/dxva2api.idl index 8dd1d96..88c586f 100644 --- a/include/dxva2api.idl +++ b/include/dxva2api.idl @@ -341,7 +341,7 @@ interface IDirect3DDeviceManager9 : IUnknown [in] HANDLE hDevice, [in] REFIID riid, [out] void** ppService); -}; +} /***************************************************************************** * IDirectXVideoAccelerationService interface @@ -363,7 +363,7 @@ interface IDirectXVideoAccelerationService : IUnknown [in] DWORD dxvaType, [out] IDirect3DSurface9 **ppSurface, [in, out] HANDLE *pSharedHandle); -}; +} /***************************************************************************** * IDirectXVideoDecoderService interface @@ -398,7 +398,7 @@ interface IDirectXVideoDecoderService : IDirectXVideoAccelerationService [in] IDirect3DSurface9 **ppDecoderRenderTargets, [in] UINT NumSurfaces, [out] IDirectXVideoDecoder **ppDecode); -}; +} /***************************************************************************** * IDirectXVideoDecoder interface @@ -437,7 +437,7 @@ interface IDirectXVideoDecoder : IUnknown HRESULT Execute( [in] const DXVA2_DecodeExecuteParams* pExecuteParams); -}; +} /***************************************************************************** * IDirectXVideoProcessorService interface @@ -496,7 +496,7 @@ interface IDirectXVideoProcessorService : IDirectXVideoAccelerationService [in] D3DFORMAT RenderTargetFormat, [in] UINT MaxNumSubStreams, [out] IDirectXVideoProcessor** ppVidProcess); -}; +} /***************************************************************************** * IDirectXVideoProcessor interface @@ -534,7 +534,7 @@ interface IDirectXVideoProcessor : IUnknown [in] const DXVA2_VideoSample* pSamples, [in] UINT NumSamples, [out] HANDLE* pHandleCompleteIDirect3DDeviceManager9); -}; +} /***************************************************************************** * IDirectXVideoMemoryConfiguration interface diff --git a/include/iads.idl b/include/iads.idl index de5730d..e7ad5fb 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -414,7 +414,7 @@ interface IADs : IDispatch [id(0x0000000e)] HRESULT GetInfoEx( [in] VARIANT vProperties, [in] long lnReserved); -}; +} /***************************************************************************** * IADsMembers interface @@ -438,7 +438,7 @@ interface IADsMembers : IDispatch [id(0x00000003), propput] HRESULT Filter([in] VARIANT pvFilter); -}; +} /***************************************************************************** * IADsGroup interface @@ -467,7 +467,7 @@ interface IADsGroup : IADs { [id(0x00000013)] HRESULT Remove([in] BSTR bstrItemToBeRemoved); -}; +} /***************************************************************************** * IADsUser interface @@ -752,7 +752,7 @@ interface IADsUser : IADs [id(0x00000044)] HRESULT ChangePassword([in] BSTR bstrOldPassword, [in] BSTR bstrNewPassword); -}; +} /***************************************************************************** * IDirectorySearch interface @@ -776,4 +776,4 @@ interface IDirectorySearch : IUnknown [out] PADS_SEARCH_COLUMN pSearchColumn); HRESULT FreeColumn([in] PADS_SEARCH_COLUMN pSearchColumn); HRESULT CloseSearchHandle([in] ADS_SEARCH_HANDLE hSearchResult); -}; +} diff --git a/include/mediaobj.idl b/include/mediaobj.idl index 04c82e8..3c426f7 100644 --- a/include/mediaobj.idl +++ b/include/mediaobj.idl @@ -213,7 +213,7 @@ interface IMediaObject : IUnknown ); HRESULT Lock(LONG bLock); -}; +} /***************************************************************************** * IMediaObjectInPlace interface diff --git a/include/metahost.idl b/include/metahost.idl index 549d664..5022c74 100644 --- a/include/metahost.idl +++ b/include/metahost.idl @@ -104,7 +104,7 @@ interface ICLRRuntimeInfo : IUnknown HRESULT IsStarted( [out] BOOL *pbStarted, [out] DWORD *pdwStartupFlags); -}; +} typedef HRESULT (__stdcall *CallbackThreadSetFnPtr)(); typedef HRESULT (__stdcall *CallbackThreadUnsetFnPtr)(); @@ -150,7 +150,7 @@ interface ICLRMetaHost : IUnknown HRESULT ExitProcess( [in] INT32 iExitCode); -}; +} [ object, diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 834aa09..ad1cef6 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -98,7 +98,7 @@ interface IMFSourceReader : IUnknown HRESULT Flush([in] DWORD index); HRESULT GetServiceForStream([in] DWORD index, [in] REFGUID service, [in] REFIID riid, [out] void **object); HRESULT GetPresentationAttribute([in] DWORD index, [in] REFGUID guid, [out] PROPVARIANT *attr); -}; +} [ object, @@ -118,7 +118,7 @@ interface IMFSinkWriter : IUnknown HRESULT Finalize(void); HRESULT GetServiceForStream([in] DWORD index, [in] REFGUID service, [in] REFIID riid, [out] void **object); HRESULT GetStatistics([in] DWORD index, [out] MF_SINK_WRITER_STATISTICS *stats); -}; +} [ object, diff --git a/include/mftransform.idl b/include/mftransform.idl index 165cad4..14f74a3 100644 --- a/include/mftransform.idl +++ b/include/mftransform.idl @@ -110,4 +110,4 @@ interface IMFTransform : IUnknown [local] HRESULT ProcessOutput([in] DWORD flags, [in] DWORD count, [in,out,size_is(count)] MFT_OUTPUT_DATA_BUFFER *samples, [out] DWORD *status); -}; +} diff --git a/include/mlang.idl b/include/mlang.idl index a497092..5867648 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -437,7 +437,7 @@ interface IMLangConvertCharset : IUnknown coclass CMLangConvertCharset { [default] interface IMLangConvertCharset; -}; +} [ object, diff --git a/include/mscoree.idl b/include/mscoree.idl index 4160264..d7e3227 100644 --- a/include/mscoree.idl +++ b/include/mscoree.idl @@ -183,7 +183,7 @@ interface ICorRuntimeHost : IUnknown HRESULT UnloadDomain([in] IUnknown* appDomain); HRESULT CurrentDomain([out] IUnknown** appDomain); -}; +} cpp_quote("DEFINE_GUID(CLSID_CLRRuntimeHost, 0x90f1a06e,0x7712,0x4762,0x86,0xb5,0x7a,0x5e,0xba,0x6b,0xdb,0x02);") diff --git a/include/msdadc.idl b/include/msdadc.idl index b1954c2..e13457a 100644 --- a/include/msdadc.idl +++ b/include/msdadc.idl @@ -61,7 +61,7 @@ interface IDataConvert : IUnknown [in] DBLENGTH *pcbSrcLength, [out] DBLENGTH *pcbDstLength, [in, size_is(*pcbSrcLength)] void *pSrc); -}; +} [ object, @@ -89,4 +89,4 @@ interface IDCInfo : IUnknown HRESULT SetInfo([in] ULONG cInfo, [in, size_is(cInfo)] DCINFO prgInfo[]); -}; +} diff --git a/include/msinkaut.idl b/include/msinkaut.idl index 58ae86c..743dec8 100644 --- a/include/msinkaut.idl +++ b/include/msinkaut.idl @@ -118,7 +118,7 @@ library MSINKAUTLib [id(0x00000001), propget] HRESULT Guid([out, retval] BSTR* Guid); [id(0x00000002), propget] HRESULT Data([out, retval] VARIANT* Data); [id(0x00000002), propput] HRESULT Data([in] VARIANT Data); - }; + } [ odl, @@ -141,7 +141,7 @@ library MSINKAUTLib HRESULT DoesPropertyExist( [in] BSTR Guid, [out, retval] VARIANT_BOOL* DoesPropertyExist); - }; + } [ odl, @@ -184,7 +184,7 @@ library MSINKAUTLib [out, retval] IInkExtendedProperties** Properties); [id(0x0000000a)] HRESULT Clone( [out, retval] IInkDrawingAttributes** DrawingAttributes); - }; + } cpp_quote("#ifndef _WINGDI_") /* already defined in wingdi.h but needed for WIDL */ @@ -257,7 +257,7 @@ cpp_quote("#endif /* _WINGDI_ */") [id(0x0000000f), propget, hidden] HRESULT Data( [out, retval] XFORM* XFORM); [id(0x0000000f), propput, hidden] HRESULT Data([in] XFORM XFORM); - }; + } interface IInkDisp; @@ -289,7 +289,7 @@ cpp_quote("#endif /* _WINGDI_ */") [in] long Left, [in] long Bottom, [in] long Right); - }; + } interface IInkStrokes; @@ -410,7 +410,7 @@ cpp_quote("#endif /* _WINGDI_ */") [id(0x00000021)] HRESULT ScaleTransform( [in] single HorizontalMultiplier, [in] single VerticalMultiplier); - }; + } interface IInkRecognitionResult; @@ -468,7 +468,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT Clip( [in] IInkRectangle *Rectangle); HRESULT RemoveRecognitionResult(); - }; + } [ odl, @@ -490,7 +490,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT Remove( [in] VARIANT Identifier); HRESULT Clear(); - }; + } interface IInkRecognitionAlternate; interface IInkRecognitionAlternates; @@ -518,7 +518,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT ModifyTopAlternate( [in] IInkRecognitionAlternate *Alternate); HRESULT SetResultOnStrokes(); - }; + } [ odl, @@ -564,7 +564,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT GetPropertyValue( [in] BSTR PropertyType, [out, retval] VARIANT *PropertyValue); - }; + } [ odl, @@ -582,7 +582,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT Item( [in] long Index, [out, retval] IInkRecognitionAlternate **InkRecoAlternate); - }; + } [ odl, @@ -674,7 +674,7 @@ cpp_quote("#endif /* _WINGDI_ */") [in] long y, [in, unique] IDataObject *DataObject, [out, retval] IInkStrokes **Strokes); - }; + } [ odl, @@ -727,7 +727,7 @@ cpp_quote("#endif /* _WINGDI_ */") [in] single HorizontalMultiplier, [in] single VerticalMultiplier, [in, defaultvalue(-1)] VARIANT_BOOL ApplyOnPenWidth); - }; + } typedef enum { ICM_InkOnly, @@ -782,7 +782,7 @@ cpp_quote("#endif /* _WINGDI_ */") [out] long* Maximum, [out] TabletPropertyMetricUnit* Units, [out] single* Resolution); - }; + } typedef enum { ICBS_Unavailable, @@ -800,7 +800,7 @@ cpp_quote("#endif /* _WINGDI_ */") [propget] HRESULT Name([out, retval] BSTR* Name); [propget] HRESULT Id([out, retval] BSTR* Id); [propget] HRESULT State([out, retval] InkCursorButtonState* CurrentState); - }; + } [ odl, @@ -814,7 +814,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT Item( [in] VARIANT Identifier, [out, retval] IInkCursorButton** Button); - }; + } [ odl, @@ -835,7 +835,7 @@ cpp_quote("#endif /* _WINGDI_ */") [out, retval] IInkTablet** Tablet); [id(0x00000003), propget] HRESULT Buttons( [out, retval] IInkCursorButtons** Buttons); - }; + } [ odl, @@ -849,7 +849,7 @@ cpp_quote("#endif /* _WINGDI_ */") HRESULT Item( [in] long Index, [out, retval] IInkCursor** Cursor); - }; + } typedef enum { IAG_AllGestures = 0, @@ -1005,5 +1005,5 @@ cpp_quote("#endif /* _WINGDI_ */") [id(0x0000000a)] HRESULT SetEventInterest( [in] InkCollectorEventInterest EventId, [in] VARIANT_BOOL Listen); - }; -}; + } +} diff --git a/include/mstask.idl b/include/mstask.idl index ecff641..0a79b79 100644 --- a/include/mstask.idl +++ b/include/mstask.idl @@ -380,7 +380,7 @@ interface ITaskScheduler : IUnknown coclass CTaskScheduler { [default] interface ITaskScheduler; -}; +} [ @@ -390,4 +390,4 @@ coclass CTaskScheduler coclass CTask { [default] interface ITask; -}; +} diff --git a/include/msxml2.idl b/include/msxml2.idl index b9cead8..cfafc42 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -684,7 +684,7 @@ interface IXMLDOMSchemaCollection2 : IXMLDOMSchemaCollection HRESULT getDeclaration( [in] IXMLDOMNode* node, [out,retval]ISchemaItem** item); -}; +} [ local, @@ -1369,7 +1369,7 @@ interface IXMLHTTPRequest : IDispatch [propput, id(14)] HRESULT onreadystatechange([in] IDispatch *pReadyStateSink); -}; +} [ object, @@ -1897,7 +1897,7 @@ interface ISAXAttributes : IUnknown [in] int nQName, [out] const WCHAR ** pValue, [out] int * nValue); -}; +} [ object, @@ -1957,7 +1957,7 @@ interface ISAXContentHandler : IUnknown HRESULT skippedEntity( [in] const WCHAR * pName, [in] int nName); -}; +} [ object, @@ -1997,7 +1997,7 @@ interface ISAXDeclHandler : IUnknown [in] int nPublicId, [in] const WCHAR * pSystemId, [in] int nSystemId); -}; +} [ object, @@ -2023,7 +2023,7 @@ interface ISAXDTDHandler : IUnknown [in] int nSystemId, [in] const WCHAR * pNotationName, [in] int nNotationName); -}; +} [ object, @@ -2036,7 +2036,7 @@ interface ISAXEntityResolver : IUnknown [in] const WCHAR * pPublicId, [in] const WCHAR * pSystemId, [out, retval] VARIANT * ret); -}; +} [ object, @@ -2059,7 +2059,7 @@ interface ISAXErrorHandler : IUnknown [in] ISAXLocator * pLocator, [in] const WCHAR * pErrorMessage, [in] HRESULT hrErrorCode); -}; +} [ object, @@ -2093,7 +2093,7 @@ interface ISAXLexicalHandler : IUnknown HRESULT comment( [in] const WCHAR * pChars, [in] int nChars); -}; +} [ object, @@ -2113,7 +2113,7 @@ interface ISAXLocator : IUnknown HRESULT getSystemId( [out, retval] const WCHAR ** systemId); -}; +} [ local, @@ -2126,7 +2126,7 @@ interface ISAXXMLFilter : ISAXXMLReader [out, retval] ISAXXMLReader ** pReader); HRESULT putParent( [in] ISAXXMLReader * reader); -}; +} [ local, @@ -2232,7 +2232,7 @@ interface IVBSAXAttributes : IDispatch [id(DISPID_SAX_ATTRIBUTES_GETVALUEFROMQNAME)] HRESULT getValueFromQName( [in] BSTR QName, [out, retval] BSTR * value); -}; +} [ object, @@ -2279,7 +2279,7 @@ interface IVBSAXContentHandler : IDispatch [id(DISPID_SAX_CONTENTHANDLER_SKIPPEDENTITY)] HRESULT skippedEntity( [in, out] BSTR * name); -}; +} [ object, @@ -2312,7 +2312,7 @@ interface IVBSAXDeclHandler : IDispatch [in, out] BSTR * name, [in, out] BSTR * publicId, [in, out] BSTR * systemId); -}; +} [ object, @@ -2334,7 +2334,7 @@ interface IVBSAXDTDHandler : IDispatch [in, out] BSTR * publicId, [in, out] BSTR * systemId, [in, out] BSTR * notationName); -}; +} [ object, @@ -2349,7 +2349,7 @@ interface IVBSAXEntityResolver : IDispatch [in, out] BSTR * publicId, [in, out] BSTR * systemId, [out, retval] VARIANT * ret); -}; +} [ object, @@ -2376,7 +2376,7 @@ interface IVBSAXErrorHandler : IDispatch [in] IVBSAXLocator * locator, [in, out] BSTR * errorMessage, [in] LONG errorCode); -}; +} [ object, @@ -2406,7 +2406,7 @@ interface IVBSAXLexicalHandler : IDispatch [id(DISPID_SAX_LEXICALHANDLER_COMMENT)] HRESULT comment( [in, out] BSTR * chars); -}; +} [ object, @@ -2427,7 +2427,7 @@ interface IVBSAXLocator : IDispatch [propget, id(DISPID_SAX_LOCATOR_SYSTEMID)] HRESULT systemId( [out, retval] BSTR * systemId); -}; +} [ object, @@ -2442,7 +2442,7 @@ interface IVBSAXXMLFilter : IDispatch [propputref, id(DISPID_SAX_XMLFILTER_PARENT)] HRESULT parent( [in] IVBSAXXMLReader * reader); -}; +} [ dual, @@ -2558,7 +2558,7 @@ interface IMXAttributes : IDispatch [id(DISPID_MX_ATTRIBUTES_SETVALUE)] HRESULT setValue([in] int index, [in] BSTR value); -}; +} [ local, @@ -2589,7 +2589,7 @@ interface IMXReaderControl : IDispatch [id(DISPID_MX_READER_CONTROL_SUSPEND)] HRESULT suspend(); -}; +} [ object, @@ -2641,7 +2641,7 @@ interface IMXWriter : IDispatch [id(DISPID_MX_WRITER_FLUSH)] HRESULT flush(); -}; +} [ local, @@ -2837,7 +2837,7 @@ interface ISchemaStringCollection : IDispatch [id(DISPID_NEWENUM), hidden, restricted, propget] HRESULT _newEnum( [out,retval] IUnknown** ppunk); -}; +} [ local, @@ -2871,7 +2871,7 @@ interface ISchemaItemCollection : IDispatch [id(DISPID_NEWENUM), hidden, restricted, propget] HRESULT _newEnum( [out,retval]IUnknown** ppunk); -}; +} [ local, @@ -2910,7 +2910,7 @@ interface ISchemaItem : IDispatch HRESULT writeAnnotation( [in] IUnknown* annotationSink, [out,retval] VARIANT_BOOL* isWritten); -}; +} [ local, @@ -2956,7 +2956,7 @@ interface ISchema : ISchemaItem [id(DISPID_SOM_SCHEMALOCATIONS), propget] HRESULT schemaLocations( [out,retval] ISchemaStringCollection** schemaLocations); -}; +} [ local, @@ -2974,7 +2974,7 @@ interface ISchemaParticle : ISchemaItem [id(DISPID_SOM_MAXOCCURS), propget] HRESULT maxOccurs( [out,retval] VARIANT* maxOccurs); -}; +} [ object, @@ -3007,7 +3007,7 @@ interface ISchemaAttribute : ISchemaItem [id(DISPID_SOM_ISREFERENCE), propget] HRESULT isReference( [out,retval] VARIANT_BOOL* reference); -}; +} [ local, @@ -3061,7 +3061,7 @@ interface ISchemaElement : ISchemaParticle [id(DISPID_SOM_ISREFERENCE), propget] HRESULT isReference( [out,retval] VARIANT_BOOL* reference); -}; +} [ local, @@ -3140,7 +3140,7 @@ interface ISchemaType : ISchemaItem [id(DISPID_SOM_PATTERNS), propget] HRESULT patterns( [out,retval] ISchemaStringCollection** patterns); -}; +} [ local, @@ -3174,7 +3174,7 @@ interface ISchemaComplexType : ISchemaType [id(DISPID_SOM_PROHIBITED), propget] HRESULT prohibitedSubstitutions( [out,retval] SCHEMADERIVATIONMETHOD* prohibited); -}; +} [ local, @@ -3192,7 +3192,7 @@ interface ISchemaAttributeGroup : ISchemaItem [id(DISPID_SOM_ATTRIBUTES), propget] HRESULT attributes( [out,retval] ISchemaItemCollection** attributes); -}; +} [ local, @@ -3206,7 +3206,7 @@ interface ISchemaModelGroup : ISchemaParticle [id(DISPID_SOM_PARTICLES), propget] HRESULT particles( [out,retval] ISchemaItemCollection** particles); -}; +} [ local, @@ -3224,7 +3224,7 @@ interface ISchemaAny : ISchemaParticle [id(DISPID_SOM_PROCESSCONTENTS), propget] HRESULT processContents( [out,retval] SCHEMAPROCESSCONTENTS* processContents); -}; +} [ local, @@ -3246,7 +3246,7 @@ interface ISchemaIdentityConstraint : ISchemaItem [id(DISPID_SOM_REFERENCEDKEY), propget] HRESULT referencedKey( [out,retval] ISchemaIdentityConstraint** key); -}; +} [ local, @@ -3264,7 +3264,7 @@ interface ISchemaNotation : ISchemaItem [id(DISPID_SOM_PUBLICIDENTIFIER), propget] HRESULT publicIdentifier( [out,retval] BSTR* uri); -}; +} [ @@ -3279,7 +3279,7 @@ coclass SAXXMLReader30 [default] interface IVBSAXXMLReader; interface ISAXXMLReader; interface IMXReaderControl; -}; +} [ uuid(7c6e29bc-8b8b-4c3d-859e-af6cd158be0f) @@ -3415,7 +3415,7 @@ coclass MXXMLWriter30 interface IVBSAXDTDHandler; interface IVBSAXErrorHandler; interface IVBSAXLexicalHandler; -}; +} [ uuid(88d969c8-f192-11d4-a65f-0040963251e5), diff --git a/include/msxml6.idl b/include/msxml6.idl index 1169e13..1f657a8 100644 --- a/include/msxml6.idl +++ b/include/msxml6.idl @@ -605,7 +605,7 @@ interface IXMLDOMSchemaCollection2 : IXMLDOMSchemaCollection HRESULT getDeclaration( [in] IXMLDOMNode* node, [out,retval]ISchemaItem** item); -}; +} [ local, @@ -1263,7 +1263,7 @@ interface IXMLHTTPRequest : IDispatch [propput, id(14)] HRESULT onreadystatechange([in] IDispatch *pReadyStateSink); -}; +} [ object, @@ -1761,7 +1761,7 @@ interface ISAXAttributes : IUnknown [in] int nQName, [out] const WCHAR ** pValue, [out] int * nValue); -}; +} [ object, @@ -1821,7 +1821,7 @@ interface ISAXContentHandler : IUnknown HRESULT skippedEntity( [in] const WCHAR * pName, [in] int nName); -}; +} [ object, @@ -1861,7 +1861,7 @@ interface ISAXDeclHandler : IUnknown [in] int nPublicId, [in] const WCHAR * pSystemId, [in] int nSystemId); -}; +} [ object, @@ -1887,7 +1887,7 @@ interface ISAXDTDHandler : IUnknown [in] int nSystemId, [in] const WCHAR * pNotationName, [in] int nNotationName); -}; +} [ object, @@ -1900,7 +1900,7 @@ interface ISAXEntityResolver : IUnknown [in] const WCHAR * pPublicId, [in] const WCHAR * pSystemId, [out, retval] VARIANT * ret); -}; +} [ object, @@ -1923,7 +1923,7 @@ interface ISAXErrorHandler : IUnknown [in] ISAXLocator * pLocator, [in] const WCHAR * pErrorMessage, [in] HRESULT hrErrorCode); -}; +} [ object, @@ -1957,7 +1957,7 @@ interface ISAXLexicalHandler : IUnknown HRESULT comment( [in] const WCHAR * pChars, [in] int nChars); -}; +} [ object, @@ -1977,7 +1977,7 @@ interface ISAXLocator : IUnknown HRESULT getSystemId( [out, retval] const WCHAR ** systemId); -}; +} [ local, @@ -1990,7 +1990,7 @@ interface ISAXXMLFilter : ISAXXMLReader [out, retval] ISAXXMLReader ** pReader); HRESULT putParent( [in] ISAXXMLReader * reader); -}; +} [ local, @@ -2096,7 +2096,7 @@ interface IVBSAXAttributes : IDispatch [id(DISPID_SAX_ATTRIBUTES_GETVALUEFROMQNAME)] HRESULT getValueFromQName( [in] BSTR QName, [out, retval] BSTR * value); -}; +} [ object, @@ -2143,7 +2143,7 @@ interface IVBSAXContentHandler : IDispatch [id(DISPID_SAX_CONTENTHANDLER_SKIPPEDENTITY)] HRESULT skippedEntity( [in, out] BSTR * name); -}; +} [ object, @@ -2176,7 +2176,7 @@ interface IVBSAXDeclHandler : IDispatch [in, out] BSTR * name, [in, out] BSTR * publicId, [in, out] BSTR * systemId); -}; +} [ object, @@ -2198,7 +2198,7 @@ interface IVBSAXDTDHandler : IDispatch [in, out] BSTR * publicId, [in, out] BSTR * systemId, [in, out] BSTR * notationName); -}; +} [ object, @@ -2213,7 +2213,7 @@ interface IVBSAXEntityResolver : IDispatch [in, out] BSTR * publicId, [in, out] BSTR * systemId, [out, retval] VARIANT * ret); -}; +} [ object, @@ -2240,7 +2240,7 @@ interface IVBSAXErrorHandler : IDispatch [in] IVBSAXLocator * locator, [in, out] BSTR * errorMessage, [in] LONG errorCode); -}; +} [ object, @@ -2270,7 +2270,7 @@ interface IVBSAXLexicalHandler : IDispatch [id(DISPID_SAX_LEXICALHANDLER_COMMENT)] HRESULT comment( [in, out] BSTR * chars); -}; +} [ object, @@ -2291,7 +2291,7 @@ interface IVBSAXLocator : IDispatch [propget, id(DISPID_SAX_LOCATOR_SYSTEMID)] HRESULT systemId( [out, retval] BSTR * systemId); -}; +} [ object, @@ -2306,7 +2306,7 @@ interface IVBSAXXMLFilter : IDispatch [propputref, id(DISPID_SAX_XMLFILTER_PARENT)] HRESULT parent( [in] IVBSAXXMLReader * reader); -}; +} [ dual, @@ -2422,7 +2422,7 @@ interface IMXAttributes : IDispatch [id(DISPID_MX_ATTRIBUTES_SETVALUE)] HRESULT setValue([in] int index, [in] BSTR value); -}; +} [ local, @@ -2453,7 +2453,7 @@ interface IMXReaderControl : IDispatch [id(DISPID_MX_READER_CONTROL_SUSPEND)] HRESULT suspend(); -}; +} [ object, @@ -2505,7 +2505,7 @@ interface IMXWriter : IDispatch [id(DISPID_MX_WRITER_FLUSH)] HRESULT flush(); -}; +} [ local, @@ -2701,7 +2701,7 @@ interface ISchemaStringCollection : IDispatch [id(DISPID_NEWENUM), hidden, restricted, propget] HRESULT _newEnum( [out,retval] IUnknown** ppunk); -}; +} [ local, @@ -2735,7 +2735,7 @@ interface ISchemaItemCollection : IDispatch [id(DISPID_NEWENUM), hidden, restricted, propget] HRESULT _newEnum( [out,retval]IUnknown** ppunk); -}; +} [ local, @@ -2774,7 +2774,7 @@ interface ISchemaItem : IDispatch HRESULT writeAnnotation( [in] IUnknown* annotationSink, [out,retval] VARIANT_BOOL* isWritten); -}; +} [ local, @@ -2820,7 +2820,7 @@ interface ISchema : ISchemaItem [id(DISPID_SOM_SCHEMALOCATIONS), propget] HRESULT schemaLocations( [out,retval] ISchemaStringCollection** schemaLocations); -}; +} [ local, @@ -2838,7 +2838,7 @@ interface ISchemaParticle : ISchemaItem [id(DISPID_SOM_MAXOCCURS), propget] HRESULT maxOccurs( [out,retval] VARIANT* maxOccurs); -}; +} [ object, @@ -2871,7 +2871,7 @@ interface ISchemaAttribute : ISchemaItem [id(DISPID_SOM_ISREFERENCE), propget] HRESULT isReference( [out,retval] VARIANT_BOOL* reference); -}; +} [ local, @@ -2925,7 +2925,7 @@ interface ISchemaElement : ISchemaParticle [id(DISPID_SOM_ISREFERENCE), propget] HRESULT isReference( [out,retval] VARIANT_BOOL* reference); -}; +} [ local, @@ -3004,7 +3004,7 @@ interface ISchemaType : ISchemaItem [id(DISPID_SOM_PATTERNS), propget] HRESULT patterns( [out,retval] ISchemaStringCollection** patterns); -}; +} [ local, @@ -3038,7 +3038,7 @@ interface ISchemaComplexType : ISchemaType [id(DISPID_SOM_PROHIBITED), propget] HRESULT prohibitedSubstitutions( [out,retval] SCHEMADERIVATIONMETHOD* prohibited); -}; +} [ local, @@ -3056,7 +3056,7 @@ interface ISchemaAttributeGroup : ISchemaItem [id(DISPID_SOM_ATTRIBUTES), propget] HRESULT attributes( [out,retval] ISchemaItemCollection** attributes); -}; +} [ local, @@ -3070,7 +3070,7 @@ interface ISchemaModelGroup : ISchemaParticle [id(DISPID_SOM_PARTICLES), propget] HRESULT particles( [out,retval] ISchemaItemCollection** particles); -}; +} [ local, @@ -3088,7 +3088,7 @@ interface ISchemaAny : ISchemaParticle [id(DISPID_SOM_PROCESSCONTENTS), propget] HRESULT processContents( [out,retval] SCHEMAPROCESSCONTENTS* processContents); -}; +} [ local, @@ -3110,7 +3110,7 @@ interface ISchemaIdentityConstraint : ISchemaItem [id(DISPID_SOM_REFERENCEDKEY), propget] HRESULT referencedKey( [out,retval] ISchemaIdentityConstraint** key); -}; +} [ local, @@ -3128,7 +3128,7 @@ interface ISchemaNotation : ISchemaItem [id(DISPID_SOM_PUBLICIDENTIFIER), propget] HRESULT publicIdentifier( [out,retval] BSTR* uri); -}; +} [ @@ -3139,7 +3139,7 @@ coclass SAXXMLReader [default] interface IVBSAXXMLReader; interface ISAXXMLReader; interface IMXReaderControl; -}; +} [ uuid(3124c396-fb13-4836-a6ad-1317f1713688) @@ -3149,7 +3149,7 @@ coclass SAXXMLReader30 [default] interface IVBSAXXMLReader; interface ISAXXMLReader; interface IMXReaderControl; -}; +} [ uuid(7c6e29bc-8b8b-4c3d-859e-af6cd158be0f) @@ -3273,7 +3273,7 @@ coclass MXXMLWriter interface IVBSAXDTDHandler; interface IVBSAXErrorHandler; interface IVBSAXLexicalHandler; -}; +} [ uuid(3d813dfe-6c91-4a4e-8f41-04346a841d9c) @@ -3293,7 +3293,7 @@ coclass MXXMLWriter30 interface IVBSAXDTDHandler; interface IVBSAXErrorHandler; interface IVBSAXLexicalHandler; -}; +} [ uuid(88d969c8-f192-11d4-a65f-0040963251e5), diff --git a/include/netcfgx.idl b/include/netcfgx.idl index d51407f..aa48742 100644 --- a/include/netcfgx.idl +++ b/include/netcfgx.idl @@ -74,7 +74,7 @@ interface INetCfgComponent : IUnknown HRESULT GetDeviceStatus ([out] ULONG* pulStatus); HRESULT OpenParamKey ([out] HKEY* phkey); HRESULT RaisePropertyUi ([in] HWND hwndParent, [in] DWORD dwFlags, [in] IUnknown* punkContext); -}; +} [ @@ -89,7 +89,7 @@ interface IEnumNetCfgComponent : IUnknown HRESULT Skip ([in] ULONG celt); HRESULT Reset (); HRESULT Clone ([out] IEnumNetCfgComponent** ppenum); -}; +} [ local, @@ -103,7 +103,7 @@ interface INetCfgLock : IUnknown [out] LPWSTR* ppszwClientDescription); HRESULT ReleaseWriteLock (); HRESULT IsWriteLocked ([out] LPWSTR* ppszwClientDescription); -}; +} [ local, @@ -120,7 +120,7 @@ interface INetCfg : IUnknown HRESULT EnumComponents ([in] const GUID* pguidClass, [out] IEnumNetCfgComponent** ppenumComponent); HRESULT FindComponent ([in] LPCWSTR pszwInfId, [out] INetCfgComponent** pComponent); HRESULT QueryNetCfgClass ([in] const GUID* pguidClass, [in] REFIID riid,[out] void** ppvObject); -}; +} [ helpstring("Network Configuration Component Object"), diff --git a/include/netcon.idl b/include/netcon.idl index eecc1d2..3db2382 100644 --- a/include/netcon.idl +++ b/include/netcon.idl @@ -179,7 +179,7 @@ interface INetSharingPortMapping : IDispatch [id(4)] HRESULT Delete(); -}; +} [ object, uuid(02e4a2de-da20-4e34-89c8-ac22275a010b), diff --git a/include/oleacc.idl b/include/oleacc.idl index 3328548..fd9c078 100644 --- a/include/oleacc.idl +++ b/include/oleacc.idl @@ -355,7 +355,7 @@ library Accessibility { interface IAccPropServices; } -}; +} cpp_quote("DEFINE_GUID(CLSID_AccPropServices, 0xb5f8350b, 0x0548, 0x48b1, 0xa6, 0xee, 0x88, 0xbd, 0x00, 0xb4, 0xa5, 0xe7);") cpp_quote("DEFINE_GUID(IIS_IsOleaccProxy, 0x902697fa, 0x80e4, 0x4560, 0x80, 0x2a, 0xa1, 0x3f, 0x22, 0xa6, 0x47, 0x09);") diff --git a/include/pstore.idl b/include/pstore.idl index a963b25..f9731d3 100644 --- a/include/pstore.idl +++ b/include/pstore.idl @@ -273,4 +273,4 @@ interface IPStore : IUnknown [in] IEnumPStoreItems** ppenum ); } -}; +} diff --git a/include/qedit.idl b/include/qedit.idl index d42e691..753ac15 100644 --- a/include/qedit.idl +++ b/include/qedit.idl @@ -78,7 +78,7 @@ interface ISampleGrabber: IUnknown ISampleGrabberCB * pCallback, LONG WhichMethodToCallback ); -}; +} [ object, @@ -157,7 +157,7 @@ interface IMediaDet : IUnknown HRESULT EnterBitmapGrabMode( double SeekTime ); -}; +} [ uuid(65BD0711-24D2-4ff7-9324-ED2E5D3ABAFA), @@ -165,7 +165,7 @@ interface IMediaDet : IUnknown coclass MediaDet { [default] interface IMediaDet; -}; +} [ object, @@ -185,7 +185,7 @@ interface IMediaLocator : IUnknown HRESULT AddFoundLocation( BSTR dir ); -}; +} typedef struct { @@ -258,7 +258,7 @@ interface IPropertySetter : IUnknown [in] IUnknown * target, [in] REFERENCE_TIME now ); -}; +} [ object, @@ -275,7 +275,7 @@ interface IAMErrorLog : IUnknown long hresult, [in] VARIANT * extra ); -}; +} [ object, @@ -292,7 +292,7 @@ interface IAMSetErrorLog : IUnknown [propput] HRESULT ErrorLog( [in] IAMErrorLog * log ); -}; +} interface IAMTimeline; interface IAMTimelineGroup; @@ -439,7 +439,7 @@ interface IAMTimeline : IUnknown HRESULT GetDefaultEffectB( [out,retval] BSTR * guidb ); -}; +} [ uuid(78530B75-61F9-11D2-8CAD-00A024580902) @@ -449,7 +449,7 @@ coclass AMTimeline [default] interface IAMTimeline; interface IPersistStream; interface IAMSetErrorLog; -}; +} [ object, @@ -536,7 +536,7 @@ interface IAMTimelineGroup : IUnknown HRESULT SetRecompFormatFromSource( IAMTimelineSrc * source ); -}; +} [ object, @@ -701,7 +701,7 @@ interface IAMTimelineObj : IUnknown HRESULT GetEmbedDepth( long * depth ); -}; +} [ object, @@ -804,7 +804,7 @@ interface IAMTimelineSrc : IUnknown HRESULT SetStretchMode( int mode ); -}; +} enum { diff --git a/include/shdeprecated.idl b/include/shdeprecated.idl index 1f001fd..3e1e5e7 100644 --- a/include/shdeprecated.idl +++ b/include/shdeprecated.idl @@ -51,7 +51,7 @@ interface ITravelEntry : IUnknown HRESULT GetPidl( [out] LPITEMIDLIST *ppidl); -}; +} [ hidden, @@ -109,7 +109,7 @@ interface ITravelLog : IUnknown [in] IUnknown *punk); HRESULT Revert(); -}; +} typedef void *CIE4ConnectionPoint; @@ -137,7 +137,7 @@ interface IExpDispSupport : IUnknown VARIANT *pVarResult, EXCEPINFO *pexcepinfo, UINT *puArgErr); -}; +} typedef enum tagBNSTATE { @@ -601,4 +601,4 @@ interface IBrowserService2 : IBrowserService HRESULT v_CheckZoneCrossing( [in, out] LPCITEMIDLIST pidl); -}; +} diff --git a/include/shobjidl.idl b/include/shobjidl.idl index f1b85a8..141ac78 100644 --- a/include/shobjidl.idl +++ b/include/shobjidl.idl @@ -1512,7 +1512,7 @@ interface IDockingWindow : IOleWindow [in] LPCRECT prcBorder, [in] IUnknown *punkToolbarSite, [in] BOOL fReserved); -}; +} /***************************************************************************** diff --git a/include/stdole2.idl b/include/stdole2.idl index 9839c4c..18c402a 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -268,7 +268,7 @@ library stdole HRESULT AddRefHfont([in] OLE_HANDLE hFont); HRESULT ReleaseHfont([in] OLE_HANDLE hFont); - }; + } [ @@ -299,7 +299,7 @@ library stdole appear at the end of the typelib. */ /* [default, source] dispinterface FontEvents;*/ interface IFont; - }; + } [ odl, @@ -349,7 +349,7 @@ library stdole [propget] HRESULT Attributes([out, retval] long *pdwAttr); HRESULT SetHdc([in] OLE_HANDLE hdc); - }; + } [ uuid(7BF80981-BF32-101A-8BBB-00AA00300CAB) @@ -373,7 +373,7 @@ library stdole OLE_XSIZE_HIMETRIC cxSrc, OLE_YSIZE_HIMETRIC cySrc, void *prcWBounds); - }; + } typedef [public] Picture IPictureDisp; @@ -383,7 +383,7 @@ library stdole coclass StdPicture { [default] dispinterface Picture; interface IPicture; - }; + } [ uuid(E6C8FA08-BD9F-11D0-985E-00C04FC29993) @@ -419,7 +419,7 @@ library stdole ] HRESULT SavePicture([in] IPictureDisp *Picture, [in] BSTR filename); - }; + } [ @@ -431,9 +431,9 @@ library stdole properties: methods: [id(DISPID_FONT_CHANGED)] void FontChanged([in] BSTR PropertyName); - }; + } typedef [public] FontEvents IFontEventsDisp; -}; +} diff --git a/include/textstor.idl b/include/textstor.idl index e79443d..c6d88c7 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -154,7 +154,7 @@ interface ITextStoreACPSink : IUnknown HRESULT OnStartEditTransaction(); HRESULT OnEndEditTransaction(); -}; +} [ object, @@ -311,4 +311,4 @@ interface ITextStoreACP : IUnknown HRESULT GetWnd( [in] TsViewCookie vcView, [out] HWND *phwnd); -}; +} diff --git a/include/transact.idl b/include/transact.idl index c9dbc69..fb3bd42 100644 --- a/include/transact.idl +++ b/include/transact.idl @@ -157,7 +157,7 @@ interface ITransaction : IUnknown { [in] BOOL fRetaining, [in] BOOL fAsync); HRESULT GetTransactionInfo([out] XACTTRANSINFO *pinfo); -}; +} [ object, @@ -165,7 +165,7 @@ interface ITransaction : IUnknown { ] interface ITransactionCloner : ITransaction { HRESULT CloneWithCommitDisabled([out] ITransaction **ppITransaction); -}; +} [ object, @@ -173,7 +173,7 @@ interface ITransactionCloner : ITransaction { ] interface ITransaction2 : ITransactionCloner { HRESULT GetTransactionInfo2([out] XACTTRANSINFO *pinfo); -}; +} [ object, @@ -186,7 +186,7 @@ interface ITransactionDispenser : IUnknown { [in] ULONG isoFlags, [in, unique] ITransactionOptions *pOptions, [out] ITransaction **ppTransaction); -}; +} [ object, @@ -195,7 +195,7 @@ interface ITransactionDispenser : IUnknown { interface ITransactionOptions : IUnknown { HRESULT SetOptions([in] XACTOPT *pOptions); HRESULT GetOptions([in, out] XACTOPT *pOptions); -}; +} [ object, @@ -213,7 +213,7 @@ interface ITransactionOutcomeEvents : IUnknown { [in, unique] BOID *pboidReason, [in] HRESULT hr); HRESULT Indoubt(void); -}; +} [ object, @@ -223,4 +223,4 @@ interface ITmNodeName : IUnknown { HRESULT GetNodeNameSize([out] ULONG *pcbNodeNameSize); HRESULT GetNodeName([in] ULONG cbNodeNameBufferSize, [in, out] LPWSTR pNodeNameBuffer); -}; +} diff --git a/include/txcoord.idl b/include/txcoord.idl index fd17d58..e4a5784 100644 --- a/include/txcoord.idl +++ b/include/txcoord.idl @@ -43,7 +43,7 @@ interface ITransactionResourceAsync : IUnknown { HRESULT CommitRequest([in]DWORD grfRM,[in]XACTUOW *pNewUOW); HRESULT AbortRequest([in]BOID *pboidReason,[in]BOOL fRetaining,[in]XACTUOW *pNewUOW); HRESULT TMDown(void); -}; +} [ object, @@ -52,7 +52,7 @@ interface ITransactionResourceAsync : IUnknown { interface ITransactionLastResourceAsync : IUnknown { HRESULT DelegateCommit([in]DWORD grfRM); HRESULT ForgetRequest([in]XACTUOW *pNewUOW); -}; +} [ object, @@ -63,7 +63,7 @@ interface ITransactionResource : IUnknown { HRESULT CommitRequest([in]DWORD grfRM,[in]XACTUOW *pNewUOW); HRESULT AbortRequest([in]BOID *pboidReason,[in]BOOL fRetaining,[in]XACTUOW *pNewUOW); HRESULT TMDown(void); -}; +} [ object, @@ -73,7 +73,7 @@ interface ITransactionEnlistmentAsync : IUnknown { HRESULT PrepareRequestDone([in]HRESULT hr,[in]IMoniker *pmk,[in]BOID *pboidReason); HRESULT CommitRequestDone([in]HRESULT hr); HRESULT AbortRequestDone([in]HRESULT hr); -}; +} [ object, @@ -81,7 +81,7 @@ interface ITransactionEnlistmentAsync : IUnknown { ] interface ITransactionLastEnlistmentAsync : IUnknown { HRESULT TransactionOutcome([in]XACTSTAT XactStat,[in]BOID *pboidReason); -}; +} [ object, @@ -90,7 +90,7 @@ interface ITransactionLastEnlistmentAsync : IUnknown { interface ITransactionExportFactory : IUnknown { HRESULT GetRemoteClassId([in]CLSID *pclsid); HRESULT Create([in]ULONG cbWhereabouts,[in]byte *rgbWhereabouts,[out]ITransactionExport **ppExport); -}; +} [ object, @@ -99,7 +99,7 @@ interface ITransactionExportFactory : IUnknown { interface ITransactionImportWhereabouts : IUnknown { HRESULT GetWhereaboutsSize([out]ULONG *pcbWhereabouts); HRESULT GetWhereabouts([in]ULONG cbWhereabouts,[out]byte *rgbWhereabouts,[out]ULONG *pcbUsed); -}; +} [ object, @@ -108,7 +108,7 @@ interface ITransactionImportWhereabouts : IUnknown { interface ITransactionExport : IUnknown { HRESULT Export([in]IUnknown *punkTransaction,[out]ULONG *pcbTransactionCookie); HRESULT GetTransactionCookie([in]IUnknown *punkTransaction,[in]ULONG cbTransactionCookie,[out]byte *rgbTransactionCookie,[out]ULONG *pcbUsed); -}; +} [ object, @@ -116,7 +116,7 @@ interface ITransactionExport : IUnknown { ] interface ITransactionImport : IUnknown { HRESULT Import([in]ULONG cbTransactionCookie,[in]byte *rgbTransactionCookie,[in]IID *piid,[out,iid_is(piid)]void **ppvTransaction); -}; +} [ object, uuid(17cf72d0-bac5-11d1-b1bf-00c04fc2f3ef) @@ -124,7 +124,7 @@ interface ITransactionImport : IUnknown { interface ITipTransaction : IUnknown { HRESULT Push([in]char *i_pszRemoteTmUrl,[out]char **o_ppszRemoteTxUrl); HRESULT GetTransactionUrl([out]char **o_ppszLocalTxUrl); -}; +} [ object, uuid(17cf72d1-bac5-11d1-b1bf-00c04fc2f3ef) @@ -133,14 +133,14 @@ interface ITipHelper : IUnknown { HRESULT Pull([in]char *i_pszTxUrl,[out]ITransaction **o_ppITransaction); HRESULT PullAsync([in]char *i_pszTxUrl,[in]ITipPullSink *i_pTipPullSink,[out]ITransaction **o_ppITransaction); HRESULT GetLocalTmUrl([out]char **o_ppszLocalTmUrl); -}; +} [ object, uuid(17cf72d2-bac5-11d1-b1bf-00c04fc2f3ef) ] interface ITipPullSink : IUnknown { HRESULT PullComplete([in]HRESULT i_hrPull); -}; +} [ object, uuid(9797c15d-a428-4291-87b6-0995031a678d) @@ -159,7 +159,7 @@ interface IDtcNetworkAccessConfig : IUnknown { HRESULT GetXAAccess([out]BOOL *pbXAAccess); HRESULT SetXAAccess([in]BOOL bXAAccess); HRESULT RestartDtcService(void); -}; +} typedef enum AUTHENTICATION_LEVEL { NO_AUTHENTICATION_REQUIRED, @@ -178,4 +178,4 @@ interface IDtcNetworkAccessConfig2 : IDtcNetworkAccessConfig { HRESULT SetNetworkOutboundAccess([in]BOOL bOutbound); HRESULT GetAuthenticationLevel([out]AUTHENTICATION_LEVEL *pAuthLevel); HRESULT SetAuthenticationLevel([in]AUTHENTICATION_LEVEL AuthLevel); -}; +} diff --git a/include/txdtc.idl b/include/txdtc.idl index 60f35a6..c294470 100644 --- a/include/txdtc.idl +++ b/include/txdtc.idl @@ -119,21 +119,21 @@ cpp_quote("#endif") ] interface IXATransLookup : IUnknown { HRESULT Lookup([out]ITransaction **ppTransaction); -}; +} [ object, uuid(bf193c85-0d1a-4290-b88f-d2cb8873d1e7) ] interface IXATransLookup2 : IUnknown { HRESULT Lookup([in]XID *pXID,[out]ITransaction **ppTransaction); -}; +} [ object, uuid(0d563181-defb-11ce-aed1-00aa0051e2c4) ] interface IResourceManagerSink : IUnknown { HRESULT TMDown(void); -}; +} [ object, uuid(13741d21-87eb-11ce-8081-0080c758527e) @@ -143,7 +143,7 @@ interface IResourceManager : IUnknown { HRESULT Reenlist([in]byte *pPrepInfo,[in]ULONG cbPrepInfo,[in]DWORD lTimeout,[out]XACTSTAT *pXactStat); HRESULT ReenlistmentComplete(void); HRESULT GetDistributedTransactionManager([in]REFIID iid,[out,iid_is(iid)]void **ppvObject); -}; +} [ object, uuid(4d964ad4-5b33-11d3-8a91-00c04f79eb6d) @@ -151,7 +151,7 @@ interface IResourceManager : IUnknown { interface ILastResourceManager : IUnknown { HRESULT TransactionCommitted([in]byte *pPrepInfo,[in]ULONG cbPrepInfo); HRESULT RecoveryDone(void); -}; +} [ object, uuid(d136c69a-f749-11d1-8f47-00c04f8ee57d) @@ -159,7 +159,7 @@ interface ILastResourceManager : IUnknown { interface IResourceManager2 : IResourceManager { HRESULT Enlist2([in]ITransaction *pTransaction,[in]ITransactionResourceAsync *pResAsync,[out]XACTUOW *pUOW,[out]LONG *pisoLevel,[out]XID *pXid,[out]ITransactionEnlistmentAsync **ppEnlist); HRESULT Reenlist2([in]XID *pXid,[in]DWORD dwTimeout,[out]XACTSTAT *pXactStat); -}; +} [ object, uuid(c8a6e3a1-9a8c-11cf-a308-00a0c905416e) @@ -167,7 +167,7 @@ interface IResourceManager2 : IResourceManager { interface IXAConfig : IUnknown { HRESULT Initialize([in]GUID clsidHelperDll); HRESULT Terminate(void); -}; +} /* commented out because idl doesn't accept xa_switch_t type [ object, @@ -176,28 +176,28 @@ interface IXAConfig : IUnknown { interface IRMHelper : IUnknown { HRESULT RMCount([in]DWORD dwcTotalNumberOfRMs); HRESULT RMInfo([in]xa_switch_t *pXa_Switch,[in]BOOL fCDeclCallingConv,[in]char *pszOpenString,[in]char *pszCloseString,[in]GUID guidRMRecovery); -}; +} [ object, uuid(E793F6D2-F53D-11cf-A60D-00A0C905416E) ] interface IXAObtainRMInfo : IUnknown { HRESULT ObtainRMInfo([in]IRMHelper *pIRMHelper); -};*/ +}*/ [ object, uuid(13741d20-87eb-11ce-8081-0080c758527e) ] interface IResourceManagerFactory : IUnknown { HRESULT Create([in]GUID *pguidRM,[in]CHAR *pszRMName,[in]IResourceManagerSink *pIResMgrSink,[out]IResourceManager **ppResMgr); -}; +} [ object, uuid(6b369c21-fbd2-11d1-8f47-00c04f8ee57d) ] interface IResourceManagerFactory2 : IResourceManagerFactory { HRESULT CreateEx([in]GUID *pguidRM,[in]CHAR *pszRMName,[in]IResourceManagerSink *pIResMgrSink,[in]REFIID riidRequested,[out, iid_is(riidRequested)]void **ppvResMgr); -}; +} [ object, @@ -206,7 +206,7 @@ interface IResourceManagerFactory2 : IResourceManagerFactory { interface IPrepareInfo : IUnknown { HRESULT GetPrepareInfoSize([out]ULONG *pcbPrepInfo); HRESULT GetPrepareInfo([out]byte *pPrepInfo); -}; +} [ object, uuid(5fab2547-9779-11d1-b886-00c04fb9618a) @@ -214,35 +214,35 @@ interface IPrepareInfo : IUnknown { interface IPrepareInfo2 : IUnknown { HRESULT GetPrepareInfoSize([out]ULONG *pcbPrepInfo); HRESULT GetPrepareInfo([in]ULONG cbPrepareInfo,[out]byte *pPrepInfo); -}; +} [ object, uuid(c23cc370-87ef-11ce-8081-0080c758527e) ] interface IGetDispenser : IUnknown { HRESULT GetDispenser([in]REFIID iid,[out,iid_is(iid)]void **ppvObject); -}; +} [ object, uuid(5433376c-414d-11d3-b206-00c04fc2f3ef) ] interface ITransactionVoterBallotAsync2 : IUnknown { HRESULT VoteRequestDone([in]HRESULT hr,[in]BOID *pboidReason); -}; +} [ object, uuid(5433376b-414d-11d3-b206-00c04fc2f3ef) ] interface ITransactionVoterNotifyAsync2 : ITransactionOutcomeEvents { HRESULT VoteRequest(void); -}; +} [ object, uuid(5433376a-414d-11d3-b206-00c04fc2f3ef) ] interface ITransactionVoterFactory2 : IUnknown { HRESULT Create([in]ITransaction *pTransaction,[in]ITransactionVoterNotifyAsync2 *pVoterNotify,[out]ITransactionVoterBallotAsync2 **ppVoterBallot); -}; +} [ object, uuid(82dc88e1-a954-11d1-8f88-00600895e7d5) @@ -253,7 +253,7 @@ interface ITransactionPhase0EnlistmentAsync : IUnknown { HRESULT Phase0Done(void); HRESULT Unenlist(void); HRESULT GetTransaction([out]ITransaction **ppITransaction); -}; +} [ object, uuid(ef081809-0c76-11d2-87a6-00c04f990f34) @@ -261,14 +261,14 @@ interface ITransactionPhase0EnlistmentAsync : IUnknown { interface ITransactionPhase0NotifyAsync : IUnknown { HRESULT Phase0Request([in]BOOL fAbortingHint); HRESULT EnlistCompleted([in]HRESULT status); -}; +} [ object, uuid(82dc88e0-a954-11d1-8f88-00600895e7d5) ] interface ITransactionPhase0Factory : IUnknown { HRESULT Create([in]ITransactionPhase0NotifyAsync *pPhase0Notify,[out]ITransactionPhase0EnlistmentAsync **ppPhase0Enlistment); -}; +} [ object, uuid(59313e01-b36c-11cf-a539-00aa006887c3) @@ -279,14 +279,14 @@ interface ITransactionTransmitter : IUnknown { HRESULT MarshalPropagationToken([in]ULONG cbToken,[out]byte *rgbToken,[out]ULONG *pcbUsed); HRESULT UnmarshalReturnToken([in]ULONG cbReturnToken,[in]byte *rgbReturnToken); HRESULT Reset(void); -}; +} [ object, uuid(59313e00-b36c-11cf-a539-00aa006887c3) ] interface ITransactionTransmitterFactory : IUnknown { HRESULT Create([out]ITransactionTransmitter **ppTransmitter); -}; +} [ object, uuid(59313e03-b36c-11cf-a539-00aa006887c3) @@ -296,14 +296,14 @@ interface ITransactionReceiver : IUnknown { HRESULT GetReturnTokenSize([out]ULONG *pcbReturnToken); HRESULT MarshalReturnToken([in]ULONG cbReturnToken,[out]byte *rgbReturnToken,[out]ULONG *pcbUsed); HRESULT Reset(void); -}; +} [ object, uuid(59313e02-b36c-11cf-a539-00aa006887c3) ] interface ITransactionReceiverFactory : IUnknown { HRESULT Create([out]ITransactionReceiver **ppReceiver); -}; +} typedef struct _ProxyConfigParams { WORD wcThreadsMax; @@ -316,20 +316,20 @@ typedef struct _ProxyConfigParams { interface IDtcLuConfigure : IUnknown { HRESULT Add([in]byte *pucLuPair,[in]DWORD cbLuPair); HRESULT Delete([in]byte *pucLuPair,[in]DWORD cbLuPair); -}; +} [ object, uuid(ac2b8ad2-d6f0-11d0-b386-00a0c9083365) ] interface IDtcLuRecovery : IUnknown { -}; +} [ object, uuid(4131e762-1aea-11d0-944b-00a0c905416e) ] interface IDtcLuRecoveryFactory : IUnknown { HRESULT Create([in]byte *pucLuPair,[in]DWORD cbLuPair,[out]IDtcLuRecovery **ppRecovery); -}; +} typedef enum _DtcLu_LocalRecovery_Work { DTCINITIATEDRECOVERYWORK_CHECKLUSTATUS = 1, @@ -403,21 +403,21 @@ interface IDtcLuRecoveryInitiatedByDtcTransWork : IUnknown { HRESULT ConversationLost(void); HRESULT GetRecoverySeqNum([out]LONG *plRecoverySeqNum); HRESULT ObsoleteRecoverySeqNum([in]LONG lNewRecoverySeqNum); -}; +} [ object, uuid(4131e766-1aea-11d0-944b-00a0c905416e) ] interface IDtcLuRecoveryInitiatedByDtcStatusWork : IUnknown { HRESULT HandleCheckLuStatus([in]LONG lRecoverySeqNum); -}; +} [ object, uuid(4131e764-1aea-11d0-944b-00a0c905416e) ] [local] interface IDtcLuRecoveryInitiatedByDtc : IUnknown { HRESULT GetWork([in,out]DTCINITIATEDRECOVERYWORK *pWork,[in,out]void **ppv); -}; +} [ object, uuid(ac2b8ad1-d6f0-11d0-b386-00a0c9083365) @@ -431,14 +431,14 @@ interface IDtcLuRecoveryInitiatedByLuWork : IUnknown { HRESULT HandleConfirmationOfOurCompareStates([in]DTCLUCOMPARESTATESCONFIRMATION Confirmation); HRESULT HandleErrorFromOurCompareStates([in]DTCLUCOMPARESTATESERROR Error); HRESULT ConversationLost(void); -}; +} [ object, uuid(4131e768-1aea-11d0-944b-00a0c905416e) ] interface IDtcLuRecoveryInitiatedByLu : IUnknown { HRESULT GetObjectToHandleWorkFromLu([out]IDtcLuRecoveryInitiatedByLuWork **ppWork); -}; +} [ object, uuid(4131e769-1aea-11d0-944b-00a0c905416e) @@ -450,7 +450,7 @@ interface IDtcLuRmEnlistment : IUnknown { HRESULT Committed(void); HRESULT Forget(void); HRESULT RequestCommit(void); -}; +} [ object, uuid(4131e770-1aea-11d0-944b-00a0c905416e) @@ -465,14 +465,14 @@ interface IDtcLuRmEnlistmentSink : IUnknown { HRESULT Forget(void); HRESULT Prepare(void); HRESULT RequestCommit(void); -}; +} [ object, uuid(4131e771-1aea-11d0-944b-00a0c905416e) ] interface IDtcLuRmEnlistmentFactory : IUnknown { HRESULT Create([in]unsigned char *pucLuPair,[in]DWORD cbLuPair,[in]ITransaction *pITransaction,[in]unsigned char *pTransId,[in]DWORD cbTransId,[in]IDtcLuRmEnlistmentSink *pRmEnlistmentSink,[in,out]IDtcLuRmEnlistment **ppRmEnlistment); -}; +} [ object, uuid(4131e773-1aea-11d0-944b-00a0c905416e) @@ -485,7 +485,7 @@ interface IDtcLuSubordinateDtc : IUnknown { HRESULT Forget(void); HRESULT Prepare(void); HRESULT RequestCommit(void); -}; +} [ object, uuid(4131e774-1aea-11d0-944b-00a0c905416e) @@ -499,14 +499,14 @@ interface IDtcLuSubordinateDtcSink : IUnknown { HRESULT Committed(void); HRESULT Forget(void); HRESULT RequestCommit(void); -}; +} [ object, uuid(4131e775-1aea-11d0-944b-00a0c905416e) ] interface IDtcLuSubordinateDtcFactory : IUnknown { HRESULT Create([in]unsigned char *pucLuPair,[in]DWORD cbLuPair,[in]IUnknown *punkTransactionOuter,[in]ISOLEVEL isoLevel,[in]ULONG isoFlags,[in]ITransactionOptions *pOptions,[out]ITransaction **ppTransaction,[in]unsigned char *pTransId,[in]DWORD cbTransId,[in]IDtcLuSubordinateDtcSink *pSubordinateDtcSink,[in,out]IDtcLuSubordinateDtc **ppSubordinateDtc); -}; +} /* these GUIDs were found in mingw header, but without corresponding interface definitions DEFINE_GUID(IID_IXAResourceManager,0x4131e751,0x1aea,0x11d0,0x94,0x4b,0x00,0xa0,0xc9,0x05,0x41,0x6e); diff --git a/include/urlmon.idl b/include/urlmon.idl index 9a39a7c..f1088e7 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -2015,7 +2015,7 @@ interface IUriBuilder: IUnknown HRESULT HasBeenModified( [out] BOOL *pfModified); -}; +} cpp_quote("HRESULT WINAPI CreateIUriBuilder(IUri*,DWORD,DWORD_PTR,IUriBuilder**);") diff --git a/include/vmr9.idl b/include/vmr9.idl index bb3681c..5340273 100644 --- a/include/vmr9.idl +++ b/include/vmr9.idl @@ -78,7 +78,7 @@ interface IVMRImagePresenter9 : IUnknown HRESULT StartPresenting([in] DWORD_PTR id); HRESULT StopPresenting([in] DWORD_PTR id); HRESULT PresentImage([in] DWORD_PTR id, [in] VMR9PresentationInfo *info); -}; +} typedef enum _VMR9SurfaceAllocationFlags { @@ -116,7 +116,7 @@ interface IVMRSurfaceAllocator9 : IUnknown HRESULT TerminateDevice([in] DWORD_PTR id); HRESULT GetSurface([in] DWORD_PTR id, [in] DWORD surfaceindex, [in] DWORD flags, [out] IDirect3DSurface9 **surface); HRESULT AdviseNotify([in] IVMRSurfaceAllocatorNotify9 *allocnotify); -}; +} [ local, @@ -128,7 +128,7 @@ interface IVMRSurfaceAllocator9 : IUnknown interface IVMRSurfaceAllocatorEx9 : IVMRSurfaceAllocator9 { HRESULT GetSurfaceEx([in] DWORD_PTR id, [in] DWORD surfaceindex, [in] DWORD flags, [out] IDirect3DSurface9 **surface, [out] RECT *dest); -}; +} [ local, @@ -144,7 +144,7 @@ interface IVMRSurfaceAllocatorNotify9 : IUnknown HRESULT ChangeD3DDevice([in] IDirect3DDevice9 *device, [in] HMONITOR monitor); HRESULT AllocateSurfaceHelper([in] VMR9AllocationInfo *allocinfo, [in, out] DWORD *numbuffers, [out] IDirect3DSurface9 **surface); HRESULT NotifyEvent([in] LONG code, [in] LONG_PTR param1, [in] LONG_PTR param2); -}; +} typedef enum _VMR9AspectRatioMode { @@ -174,7 +174,7 @@ interface IVMRWindowlessControl9 : IUnknown HRESULT GetCurrentImage([out] BYTE **dib); HRESULT SetBorderColor([in] COLORREF color); HRESULT GetBorderColor([out] COLORREF *color); -}; +} typedef enum _VMR9MixerPrefs { @@ -264,7 +264,7 @@ interface IVMRMixerControl9 : IUnknown HRESULT SetProcAmpControl([in] DWORD streamid, [in] VMR9ProcAmpControl *control); HRESULT GetProcAmpControl([in] DWORD streamid, [in, out] VMR9ProcAmpControl *control); HRESULT GetProcAmpControlRange([in] DWORD streamid, [in, out] VMR9ProcAmpControlRange *controlrange); -}; +} typedef struct _VMR9AlphaBitmap { @@ -300,7 +300,7 @@ interface IVMRMixerBitmap9 : IUnknown HRESULT SetAlphaBitmap([in] const VMR9AlphaBitmap *bitmap); HRESULT UpdateAlphaBitmapParameters([in] const VMR9AlphaBitmap *bitmap); HRESULT GetAlphaBitmapParameters([out] VMR9AlphaBitmap *bitmap); -}; +} [ local, @@ -315,7 +315,7 @@ interface IVMRSurface9 : IUnknown HRESULT LockSurface([out] BYTE **surface); HRESULT UnlockSurface(); HRESULT GetSurface([out] IDirect3DSurface9 **surface); -}; +} typedef enum _VMR9RenderPrefs { @@ -334,7 +334,7 @@ interface IVMRImagePresenterConfig9 : IUnknown { HRESULT SetRenderingPrefs([in] DWORD renderflags); HRESULT GetRenderingPrefs([out] DWORD *renderflags); -}; +} [ local, @@ -347,7 +347,7 @@ interface IVMRVideoStreamControl9: IUnknown { HRESULT SetStreamActiveState([in] BOOL active); HRESULT GetStreamActiveState([out] BOOL *active); -}; +} typedef enum _VMR9Mode { @@ -373,7 +373,7 @@ interface IVMRFilterConfig9 : IUnknown HRESULT GetRenderingPrefs([out] DWORD *renderflags); HRESULT SetRenderingMode([in] DWORD mode); HRESULT GetRenderingMode([out] DWORD *mode); -}; +} [ local, @@ -420,7 +420,7 @@ interface IVMRMonitorConfig9 : IUnknown HRESULT SetDefaultMonitor([in] UINT uDev); HRESULT GetDefaultMonitor([out] UINT *uDev); HRESULT GetAvailableMonitors([out, size_is(arraysize)] VMR9MonitorInfo *info, [in] DWORD arraysize, [out] DWORD *numdev); -}; +} typedef enum _VMR9DeinterlacePrefs { @@ -493,7 +493,7 @@ interface IVMRDeinterlaceControl9 : IUnknown HRESULT GetDeinterlacePrefs([out] DWORD *prefs); HRESULT SetDeinterlacePrefs([in] DWORD prefs); HRESULT GetActualDeinterlaceMode([in] DWORD streamid, [out] GUID *mode); -}; +} typedef struct _VMR9VideoStreamInfo { IDirect3DSurface9 *pddsVideoSurface; @@ -521,4 +521,4 @@ interface IVMRImageCompositor9 : IUnknown HRESULT CompositeImage([in] IUnknown *d3ddev, [in] IDirect3DSurface9 *d3dtarget, [in] AM_MEDIA_TYPE *mttarget, [in] REFERENCE_TIME start, [in] REFERENCE_TIME stop, D3DCOLOR back, [in] VMR9VideoStreamInfo *info, [in] UINT streams); -}; +} diff --git a/include/vmrender.idl b/include/vmrender.idl index c3d053d..c81a1ac 100644 --- a/include/vmrender.idl +++ b/include/vmrender.idl @@ -76,7 +76,7 @@ interface IVMRImagePresenter : IUnknown HRESULT StartPresenting([in] DWORD_PTR id); HRESULT StopPresenting([in] DWORD_PTR id); HRESULT PresentImage([in] DWORD_PTR id, [in] VMRPRESENTATIONINFO *info); -}; +} typedef enum _VMRSurfaceAllocationFlags { @@ -113,7 +113,7 @@ interface IVMRSurfaceAllocator : IUnknown HRESULT FreeSurface([in] DWORD_PTR id); HRESULT PrepareSurface([in] DWORD_PTR id, [in] IDirectDrawSurface7 *surface, [in] DWORD dwSurfaceFlags); HRESULT AdviseNotify([in] IVMRSurfaceAllocatorNotify *notify); -}; +} [ local, @@ -130,7 +130,7 @@ interface IVMRSurfaceAllocatorNotify : IUnknown HRESULT RestoreDDrawSurfaces(); HRESULT NotifyEvent([in] LONG EventCode, [in] LONG_PTR p1, [in] LONG_PTR p2); HRESULT SetBorderColor([in] COLORREF border); -}; +} typedef enum _VMR_ASPECT_RATIO_MODE { @@ -162,7 +162,7 @@ interface IVMRWindowlessControl : IUnknown HRESULT GetBorderColor([out] COLORREF *border); HRESULT SetColorKey([in] COLORREF key); HRESULT GetColorKey([out] COLORREF *key); -}; +} typedef enum _VMRMixerPrefs { @@ -213,7 +213,7 @@ interface IVMRMixerControl : IUnknown HRESULT GetBackgroundClr([out] COLORREF *background); HRESULT SetMixingPrefs([in] DWORD prefs); HRESULT GetMixingPrefs([out] DWORD *prefs); -}; +} typedef struct tagVMRGUID { @@ -293,7 +293,7 @@ interface IVMRFilterConfig : IUnknown HRESULT GetRenderingPrefs([out] DWORD *prefs); HRESULT SetRenderingMode([in] DWORD mode); HRESULT GetRenderingMode([out] DWORD *mode); -}; +} [ local, @@ -306,7 +306,7 @@ interface IVMRAspectRatioControl : IUnknown { HRESULT GetAspectRatioMode([out] DWORD *armode); HRESULT SetAspectRatioMode([in] DWORD armode); -}; +} typedef enum _VMRDeinterlacePrefs { @@ -369,7 +369,7 @@ interface IVMRDeinterlaceControl : IUnknown HRESULT GetDeinterlacePrefs([out] DWORD *prefs); HRESULT SetDeinterlacePrefs([in] DWORD prefs); HRESULT GetActualDeinterlaceMode([in] DWORD id, [out] GUID *mode); -}; +} typedef struct _VMRALPHABITMAP { @@ -400,7 +400,7 @@ interface IVMRMixerBitmap : IUnknown HRESULT SetAlphaBitmap([in] const VMRALPHABITMAP *params); HRESULT UpdateAlphaBitmapParameters([in] VMRALPHABITMAP *params); HRESULT GetAlphaBitmapParameters([out] VMRALPHABITMAP *params); -}; +} typedef struct _VMRVIDEOSTREAMINFO { @@ -428,7 +428,7 @@ interface IVMRImageCompositor : IUnknown HRESULT CompositeImage([in] IUnknown *d3ddev, [in] IDirectDrawSurface7 *rendertarget, [in] AM_MEDIA_TYPE *pmt, [in] REFERENCE_TIME start, [in] REFERENCE_TIME stop, [in] DWORD backgrnd, [in] VMRVIDEOSTREAMINFO *info, [in] UINT streams); -}; +} [ local, @@ -443,7 +443,7 @@ interface IVMRVideoStreamControl : IUnknown HRESULT GetColorKey([out] DDCOLORKEY *key); HRESULT SetStreamActiveState([in] BOOL active); HRESULT GetStreamActiveState([out] BOOL *active); -}; +} [ local, @@ -456,7 +456,7 @@ interface IVMRImagePresenterConfig : IUnknown { HRESULT SetRenderingPrefs([in] DWORD prefs); HRESULT GetRenderingPrefs([out] DWORD *prefs); -}; +} [ local, @@ -469,7 +469,7 @@ interface IVMRImagePresenterExclModeConfig : IVMRImagePresenterConfig { HRESULT SetXlcModeDDObjAndPrimarySurface([in] IDirectDraw7 *dddev, [in] IDirectDrawSurface7 *ddsurface); HRESULT GetXlcModeDDObjAndPrimarySurface([out] IDirectDraw7 **dddev, [out] IDirectDrawSurface7 **ddsurface); -}; +} [ local, @@ -482,4 +482,4 @@ interface IVPManager : IUnknown { HRESULT SetVideoPortIndex([in] DWORD index); HRESULT GetVideoPortIndex([out] DWORD *index); -}; +} diff --git a/include/wbemcli.idl b/include/wbemcli.idl index 7a309e8..4a0f4e2 100644 --- a/include/wbemcli.idl +++ b/include/wbemcli.idl @@ -275,7 +275,7 @@ interface IWbemLocator : IUnknown [in] const BSTR strAuthority, [in] IWbemContext *pCtx, [out] IWbemServices **ppNamespace); -}; +} [ object, @@ -295,7 +295,7 @@ interface IWbemStatusCodeText : IUnknown [in] LCID LocaleId, [in] LONG lFlags, [out] BSTR *MessageText); -}; +} [ object, @@ -313,7 +313,7 @@ interface IWbemObjectSink : IUnknown [in] HRESULT hResult, [in] BSTR strParam, [in] IWbemClassObject *pObjParam); -}; +} typedef [v1_enum] enum tag_WBEM_GENERIC_FLAG_TYPE { @@ -484,7 +484,7 @@ interface IWbemServices : IUnknown [in] IWbemContext *pCtx, [in] IWbemClassObject *pInParams, [in] IWbemObjectSink *pResponseHandler); -}; +} [ object, @@ -511,7 +511,7 @@ interface IEnumWbemClassObject : IUnknown HRESULT Skip( [in] long lTimeout, [in] ULONG nCount); -}; +} [ object, @@ -659,4 +659,4 @@ interface IWbemQualifierSet : IUnknown [out] long *plFlavor); HRESULT EndEnumeration(); -}; +} diff --git a/include/wbemdisp.idl b/include/wbemdisp.idl index b7e7a37..8ccdd0c 100644 --- a/include/wbemdisp.idl +++ b/include/wbemdisp.idl @@ -151,7 +151,7 @@ interface ISWbemEventSource : IDispatch [ id(2), propget ] HRESULT Security_( [out, retval] ISWbemSecurity **objWbemSecurity); -}; +} [ object, @@ -178,7 +178,7 @@ interface ISWbemLocator : IDispatch [ id(2), propget ] HRESULT Security_([out, retval] ISWbemSecurity **objWbemSecurity); -}; +} [ object, @@ -211,7 +211,7 @@ interface ISWbemMethod : IDispatch [ id(5), propget ] HRESULT Qualifiers_( [out, retval] ISWbemQualifierSet **objWbemQualifierSet); -}; +} [ object, @@ -237,7 +237,7 @@ interface ISWbemMethodSet : IDispatch [ id(1), propget ] HRESULT Count( [out, retval] long *iCount); -}; +} [ object, @@ -260,7 +260,7 @@ interface ISWbemNamedValue : IDispatch [ id(2), propget ] HRESULT Name( [out, retval] BSTR *strName); -}; +} [ object, @@ -304,7 +304,7 @@ interface ISWbemNamedValueSet : IDispatch [ id(5) ] HRESULT DeleteAll(); -}; +} [ object, @@ -484,7 +484,7 @@ interface ISWbemObject : IDispatch [ id(25), propget ] HRESULT Security_( [out, retval] ISWbemSecurity **objWbemSecurity); -}; +} [ object, @@ -586,7 +586,7 @@ interface ISWbemObjectPath : IDispatch [ id(14), propput ] HRESULT Authority( [in] BSTR strAuthority); -}; +} [ object, @@ -621,7 +621,7 @@ interface ISWbemObjectSet : IDispatch HRESULT ItemIndex( [in] long lIndex, [out, retval] ISWbemObject **objWbemObject); -}; +} typedef [ @@ -689,7 +689,7 @@ interface ISWbemPrivilege : IDispatch [ id(3), propget ] HRESULT Identifier( [out, retval] WbemPrivilegeEnum *iPrivilege); -}; +} [ object, @@ -733,7 +733,7 @@ interface ISWbemPrivilegeSet : IDispatch [in] BSTR strPrivilege, [in, defaultvalue(TRUE)] VARIANT_BOOL bIsEnabled, [out, retval] ISWbemPrivilege **objWbemPrivilege); -}; +} typedef [ @@ -802,7 +802,7 @@ interface ISWbemProperty : IDispatch [ id(6), propget ] HRESULT IsArray( [out, retval] VARIANT_BOOL *bIsArray); -}; +} [ object, @@ -840,7 +840,7 @@ interface ISWbemPropertySet : IDispatch HRESULT Remove( [in] BSTR strName, [in, defaultvalue(0)] long iFlags); -}; +} [ object, @@ -897,7 +897,7 @@ interface ISWbemQualifier : IDispatch [ id(6), propget ] HRESULT IsAmended( [out, retval] VARIANT_BOOL *bIsAmended); -}; +} [ object, @@ -938,7 +938,7 @@ interface ISWbemQualifierSet : IDispatch HRESULT Remove( [in] BSTR strName, [in, defaultvalue(0)] long iFlags); -}; +} typedef [ @@ -999,7 +999,7 @@ interface ISWbemSecurity : IDispatch [ id(3), propget ] HRESULT Privileges( [out, retval] ISWbemPrivilegeSet **objWbemPrivilegeSet); -}; +} [ object, @@ -1183,7 +1183,7 @@ interface ISWbemServices : IDispatch [ id(19), propget ] HRESULT Security_( [out, retval] ISWbemSecurity **objWbemSecurity); -}; +} [ threading(apartment), @@ -1194,6 +1194,6 @@ interface ISWbemServices : IDispatch coclass SWbemLocator { interface ISWbemLocator; -}; +} -}; /* WbemScripting */ +} /* WbemScripting */ diff --git a/include/wincodec.idl b/include/wincodec.idl index e727cbd..f2c5a9e 100644 --- a/include/wincodec.idl +++ b/include/wincodec.idl @@ -890,7 +890,7 @@ interface IWICImageEncoder : IUnknown [in] ID2D1Image *image, [in] IWICBitmapEncoder *encoder, [in, unique] const WICImageParameters *parameters); -}; +} cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") cpp_quote("DEFINE_GUID(CLSID_WICImagingFactory1, 0xcacaf262,0x9370,0x4615,0xa1,0x3b,0x9f,0x55,0x39,0xda,0x4c,0x0a);") @@ -1032,7 +1032,7 @@ interface IWICImagingFactory2 : IWICImagingFactory HRESULT CreateImageEncoder( [in] ID2D1Device *device, [out] IWICImageEncoder **encoder); -}; +} [ local, diff --git a/include/wmdrmsdk.idl b/include/wmdrmsdk.idl index 8de3b35..35d1a89 100644 --- a/include/wmdrmsdk.idl +++ b/include/wmdrmsdk.idl @@ -77,5 +77,5 @@ library WMDRMContentEnablerLib coclass WMDRMContentEnablerActivate { [default] interface IPersistStream; - }; -}; + } +} diff --git a/include/wmiutils.idl b/include/wmiutils.idl index fa790c8..5753c97 100644 --- a/include/wmiutils.idl +++ b/include/wmiutils.idl @@ -117,7 +117,7 @@ interface IWbemPathKeyList : IUnknown [in] long lFlags, [in,out] ULONG *puBuffLength, [in,out,string] LPWSTR pszText); -}; +} cpp_quote("#ifdef WINE_NO_UNICODE_MACROS") cpp_quote("#undef GetClassName") @@ -225,7 +225,7 @@ interface IWbemPath : IUnknown BOOL IsSameClassName( [in,string] LPCWSTR wszClass); -}; +} [ uuid(cf4cc405-e2c5-4ddd-b3ce-5e7582d8c9fa) @@ -233,4 +233,4 @@ interface IWbemPath : IUnknown coclass WbemDefPath { interface IWbemPath; -}; +} diff --git a/include/wmsbuffer.idl b/include/wmsbuffer.idl index fceff5c..6ec9dfc 100644 --- a/include/wmsbuffer.idl +++ b/include/wmsbuffer.idl @@ -40,4 +40,4 @@ interface INSSBuffer : IUnknown HRESULT GetBufferAndLength( [out] BYTE **ppdwBuffer, [out] DWORD *pdwLength); -}; +} diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index b4bd600..d1cbcd2 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -233,7 +233,7 @@ interface IWMStatusCallback : IUnknown [in] WMT_ATTR_DATATYPE dwType, [in] BYTE *pValue, [in] void *pvContext); -}; +} [ object, @@ -250,7 +250,7 @@ interface IWMReaderCallback : IWMStatusCallback [in] DWORD dwFlags, [in] INSSBuffer *pSample, [in] void *pvContext); -}; +} [ object, @@ -298,7 +298,7 @@ interface IWMBandwidthSharing : IWMStreamList HRESULT SetBandwidth( [in] DWORD bitrate, [in] DWORD buffer); -}; +} [ object, @@ -460,7 +460,7 @@ interface IWMProfile3 : IWMProfile2 HRESULT GetExpectedPacketCount( [in] QWORD duration, [out] QWORD *packets); -}; +} [ object, @@ -514,7 +514,7 @@ interface IWMMediaProps : IUnknown HRESULT SetMediaType( [in] WM_MEDIA_TYPE *pType); -}; +} [ object, @@ -531,7 +531,7 @@ interface IWMOutputMediaProps : IWMMediaProps HRESULT GetConnectionName( [out, size_is(*pcchName)] WCHAR *pwszName, [in, out] WORD *pcchName); -}; +} [ object, @@ -547,7 +547,7 @@ interface IWMMetadataEditor : IUnknown HRESULT Close(); HRESULT Flush(); -}; +} [ object, @@ -595,7 +595,7 @@ interface IWMReader : IUnknown HRESULT Pause(); HRESULT Resume(); -}; +} [ object, @@ -950,7 +950,7 @@ interface IWMSyncReader : IUnknown HRESULT OpenStream( [in] IStream *pStream); -}; +} [ object, @@ -1203,7 +1203,7 @@ interface IWMHeaderInfo : IUnknown HRESULT RemoveScript( [in] WORD index ); -}; +} [ object, @@ -1225,7 +1225,7 @@ interface IWMHeaderInfo2 : IWMHeaderInfo [out] WMT_CODEC_INFO_TYPE *codec_type, [in, out] WORD *codec_info_cnt, [out, size_is( *codec_info_cnt )] BYTE *codec_info ); -}; +} [ object, @@ -1283,7 +1283,7 @@ interface IWMHeaderInfo3 : IWMHeaderInfo2 [in] WMT_CODEC_INFO_TYPE codec_type, [in] WORD codec_info_cnt, [in, size_is( codec_info_cnt )] BYTE *codec_info ); -}; +} [ object, @@ -1442,7 +1442,7 @@ interface IWMPacketSize : IUnknown { HRESULT GetMaxPacketSize([out] DWORD *size); HRESULT SetMaxPacketSize([in] DWORD size); -}; +} [ object, @@ -1454,7 +1454,7 @@ interface IWMPacketSize2 : IWMPacketSize { HRESULT GetMinPacketSize([out] DWORD *size); HRESULT SetMinPacketSize([in] DWORD size); -}; +} [ object, @@ -1484,7 +1484,7 @@ interface IWMDRMReader : IUnknown [out] WMT_ATTR_DATATYPE *type, [out, size_is( *length )] BYTE *value, [in, out] WORD *length); -}; +} [ object, @@ -1506,7 +1506,7 @@ interface IWMDRMReader2 : IWMDRMReader [out] DWORD *level); HRESULT TryNextLicense(); -}; +} [ object, @@ -1519,7 +1519,7 @@ interface IWMDRMReader3 : IWMDRMReader2 HRESULT GetInclusionList( [out] GUID **guids, [out] DWORD *count); -}; +} [ object, @@ -1537,7 +1537,7 @@ interface IWMReaderAccelerator : IUnknown HRESULT Notify( [in] DWORD output, [in] WM_MEDIA_TYPE *subtype); -}; +} [ object, @@ -1556,7 +1556,7 @@ interface IWMReaderTimecode : IUnknown [in] WORD range, [out] DWORD *start_timecode, [out] DWORD *end_timecode); -}; +} [ object, @@ -1569,7 +1569,7 @@ interface IWMReaderTypeNegotiation : IUnknown HRESULT TryOutputProps( [in] DWORD output, [in] IWMOutputMediaProps *props); -}; +} [ object, @@ -1590,7 +1590,7 @@ interface IWMLanguageList : IUnknown HRESULT AddLanguageByRFC1766String( [in] LPCWSTR_WMSDK_TYPE_SAFE language, [out] WORD *index); -}; +} [ object, @@ -1613,7 +1613,7 @@ interface IWMReaderPlaylistBurn : IUnknown HRESULT Cancel(); HRESULT EndPlaylistBurn([in] HRESULT result); -}; +} cpp_quote("HRESULT WINAPI WMCreateWriter(IUnknown*,IWMWriter**);") diff --git a/include/wsdxml.idl b/include/wsdxml.idl index 33bd1d9..1fb3bbd 100644 --- a/include/wsdxml.idl +++ b/include/wsdxml.idl @@ -38,6 +38,6 @@ interface IWSDXMLContext : IUnknown HRESULT SetNamespaces([in, size_is(wNamespacesCount)] const PCWSDXML_NAMESPACE* pNamespaces, [in] WORD wNamespacesCount, [in] BYTE bLayerNumber); HRESULT SetTypes([in, size_is(dwTypesCount)] const PCWSDXML_TYPE* pTypes, [in] DWORD dwTypesCount, [in] BYTE bLayerNumber); -}; +} cpp_quote("HRESULT WINAPI WSDXMLCreateContext(IWSDXMLContext **ppContext);") -- 2.1.4

1 0

[PATCH 2/3] d2d1/tests: Introduce an ARRAY_SIZE macro.
by Henri Verbeet 13 Dec '17

13 Dec '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 5116d78..af023a1 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -26,6 +26,10 @@ #include "dwrite.h" #include "wincodec.h" +#ifndef ARRAY_SIZE +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) +#endif + struct resource_readback { ID3D10Resource *resource; @@ -1618,7 +1622,7 @@ static void test_bitmap_brush(void) ID2D1RenderTarget_Clear(rt, &color); ID2D1BitmapBrush_SetOpacity(brush, 1.0f); - for (i = 0; i < sizeof(extend_mode_tests) / sizeof(*extend_mode_tests); ++i) + for (i = 0; i < ARRAY_SIZE(extend_mode_tests); ++i) { ID2D1BitmapBrush_SetExtendModeX(brush, extend_mode_tests[i].extend_mode_x); extend_mode = ID2D1BitmapBrush_GetExtendModeX(brush); @@ -1776,7 +1780,7 @@ static void test_linear_brush(void) ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); - hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, sizeof(stops) / sizeof(*stops), + hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, ARRAY_SIZE(stops), D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &gradient); ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr); @@ -1813,7 +1817,7 @@ static void test_linear_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); get_surface_readback(surface, &rb); - for (i = 0; i < sizeof(test1) / sizeof(*test1); ++i) + for (i = 0; i < ARRAY_SIZE(test1); ++i) { DWORD colour; @@ -1886,7 +1890,7 @@ static void test_linear_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); get_surface_readback(surface, &rb); - for (i = 0; i < sizeof(test2) / sizeof(*test2); ++i) + for (i = 0; i < ARRAY_SIZE(test2); ++i) { DWORD colour; @@ -1982,7 +1986,7 @@ static void test_radial_brush(void) ID2D1RenderTarget_SetDpi(rt, 192.0f, 48.0f); ID2D1RenderTarget_SetAntialiasMode(rt, D2D1_ANTIALIAS_MODE_ALIASED); - hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, sizeof(stops) / sizeof(*stops), + hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, ARRAY_SIZE(stops), D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &gradient); ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr); @@ -2025,7 +2029,7 @@ static void test_radial_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); get_surface_readback(surface, &rb); - for (i = 0; i < sizeof(test1) / sizeof(*test1); ++i) + for (i = 0; i < ARRAY_SIZE(test1); ++i) { DWORD colour; @@ -2100,7 +2104,7 @@ static void test_radial_brush(void) ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); get_surface_readback(surface, &rb); - for (i = 0; i < sizeof(test2) / sizeof(*test2); ++i) + for (i = 0; i < ARRAY_SIZE(test2); ++i) { DWORD colour; @@ -3622,7 +3626,7 @@ static void test_bitmap_formats(void) bitmap_desc.dpiX = 96.0f; bitmap_desc.dpiY = 96.0f; - for (i = 0; i < sizeof(bitmap_formats) / sizeof(*bitmap_formats); ++i) + for (i = 0; i < ARRAY_SIZE(bitmap_formats); ++i) { for (j = 0; j < 4; ++j) { @@ -4406,7 +4410,7 @@ static void test_create_target(void) hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); - for (i = 0; i < sizeof(create_dpi_tests) / sizeof(*create_dpi_tests); ++i) + for (i = 0; i < ARRAY_SIZE(create_dpi_tests); ++i) { ID2D1GdiInteropRenderTarget *interop; D2D1_RENDER_TARGET_PROPERTIES desc; @@ -4595,7 +4599,7 @@ todo_wine hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(hr == S_OK, "EndDraw failure expected, hr %#x.\n", hr); - for (i = 0; i < sizeof(antialias_mode_tests)/sizeof(*antialias_mode_tests); i++) + for (i = 0; i < ARRAY_SIZE(antialias_mode_tests); ++i) { IDWriteRenderingParams *rendering_params; @@ -4691,7 +4695,7 @@ static void test_dc_target(void) hr = D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory, NULL, (void **)&factory); ok(SUCCEEDED(hr), "Failed to create factory, hr %#x.\n", hr); - for (i = 0; i < sizeof(invalid_formats) / sizeof(*invalid_formats); ++i) + for (i = 0; i < ARRAY_SIZE(invalid_formats); ++i) { desc.type = D2D1_RENDER_TARGET_TYPE_DEFAULT; desc.pixelFormat = invalid_formats[i]; @@ -5219,7 +5223,7 @@ static void test_stroke_style(void) desc.miterLimit = 1.5f; desc.dashOffset = 0.0f; - for (i = 0; i < sizeof(dash_style_tests)/sizeof(dash_style_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(dash_style_tests); ++i) { float dashes[10]; UINT dash_count; @@ -5232,7 +5236,7 @@ static void test_stroke_style(void) dash_count = ID2D1StrokeStyle_GetDashesCount(style); ok(dash_count == dash_style_tests[i].dash_count, "%u: unexpected dash count %u, expected %u.\n", i, dash_count, dash_style_tests[i].dash_count); - ok(dash_count < sizeof(dashes)/sizeof(dashes[0]), "%u: unexpectedly large dash count %u.\n", i, dash_count); + ok(dash_count < ARRAY_SIZE(dashes), "%u: unexpectedly large dash count %u.\n", i, dash_count); if (dash_count == dash_style_tests[i].dash_count) { unsigned int j; @@ -5243,11 +5247,11 @@ static void test_stroke_style(void) /* Ask for more dashes than style actually has. */ memset(dashes, 0xcc, sizeof(dashes)); - ID2D1StrokeStyle_GetDashes(style, dashes, sizeof(dashes)/sizeof(dashes[0])); + ID2D1StrokeStyle_GetDashes(style, dashes, ARRAY_SIZE(dashes)); ok(!memcmp(dashes, dash_style_tests[i].dashes, sizeof(*dashes) * dash_count), "%u: unexpected dash array.\n", i); - for (j = dash_count; j < sizeof(dashes)/sizeof(dashes[0]); j++) + for (j = dash_count; j < ARRAY_SIZE(dashes); ++j) ok(dashes[j] == 0.0f, "%u: unexpected dash value at %u.\n", i, j); } @@ -5308,9 +5312,9 @@ static void test_gradient(void) set_color(&stops[0].color, 1.0f, 0.5f, 0.4f, 1.0f); color = stops[0].color; stops[2] = stops[1] = stops[0]; - ID2D1GradientStopCollection_GetGradientStops(gradient, stops, sizeof(stops)/sizeof(stops[0])); + ID2D1GradientStopCollection_GetGradientStops(gradient, stops, ARRAY_SIZE(stops)); ok(!memcmp(stops, stops2, sizeof(*stops) * count), "Unexpected gradient stops array.\n"); - for (i = count; i < sizeof(stops)/sizeof(stops[0]); i++) + for (i = count; i < ARRAY_SIZE(stops); ++i) { ok(stops[i].position == 123.4f, "%u: unexpected stop position %f.\n", i, stops[i].position); ok(!memcmp(&stops[i].color, &color, sizeof(color)), "%u: unexpected stop color.\n", i); -- 2.1.4

1 0

[PATCH 1/3] d3d11/tests: Add a couple of testcases for sRGB SRVs.
by Henri Verbeet 13 Dec '17

13 Dec '17

From: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4b23546..74c0488 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3287,6 +3287,7 @@ static void test_create_shader_resource_view(void) #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN #define RGBA8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM +#define RGBA8_SRGB DXGI_FORMAT_R8G8B8A8_UNORM_SRGB #define RGBA8_UINT DXGI_FORMAT_R8G8B8A8_UINT #define RGBA8_TL DXGI_FORMAT_R8G8B8A8_TYPELESS #define DIM_UNKNOWN D3D11_SRV_DIMENSION_UNKNOWN @@ -3412,6 +3413,8 @@ static void test_create_shader_resource_view(void) {{TEX_2D, 1, 9, RGBA8_UNORM}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_UINT, TEX_2D, 0, 1}}, {{TEX_2D, 1, 1, RGBA8_UINT}, {RGBA8_UNORM, TEX_2D, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_SRGB, TEX_2D, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_SRGB}, {RGBA8_UNORM, TEX_2D, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D_ARRAY, 0, 1, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_2D, 0, 1}}, @@ -3431,6 +3434,9 @@ static void test_create_shader_resource_view(void) }; #undef FMT_UNKNOWN #undef RGBA8_UNORM +#undef RGBA8_SRGB +#undef RGBA8_UINT +#undef RGBA8_TL #undef DIM_UNKNOWN #undef TEX_1D #undef TEX_1D_ARRAY @@ -8001,6 +8007,7 @@ static void test_render_target_views(void) #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN #define RGBA8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM #define RGBA8_SRGB DXGI_FORMAT_R8G8B8A8_UNORM_SRGB +#define RGBA8_UINT DXGI_FORMAT_R8G8B8A8_UINT #define RGBA8_TL DXGI_FORMAT_R8G8B8A8_TYPELESS #define DIM_UNKNOWN D3D11_RTV_DIMENSION_UNKNOWN #define TEX_1D D3D11_RTV_DIMENSION_TEXTURE1D @@ -8062,6 +8069,7 @@ static void test_render_target_views(void) #undef FMT_UNKNOWN #undef RGBA8_UNORM #undef RGBA8_SRGB +#undef RGBA8_UINT #undef RGBA8_TL #undef DIM_UNKNOWN #undef TEX_1D -- 2.1.4

1 0

[Tools v4 1/2] testbot: Run make_makefiles when a file is added or removed.
by Zebediah Figura 13 Dec '17

13 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: also run 'git add -A' so that new files will actually be seen by make_makefiles. v3: also check if tools/make_makefiles itself was modified. testbot/bin/build/Build.pl | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 051039f..82cd66a 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -74,6 +74,7 @@ sub ApplyPatch($$$) { my ($PatchFile, $PatchType, $BaseName) = @_; + my $NeedMakeMakefiles = !1; my $NeedMakefile = 0; my $NeedMakeInclude = !1; my $NeedBuildDeps = !1; @@ -84,7 +85,7 @@ sub ApplyPatch($$$) { my $Line; while (defined($Line = <FH>) && - ($NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || + (! $NeedMakeMakefiles || $NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) { if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) @@ -111,13 +112,19 @@ sub ApplyPatch($$$) { $NeedConfigure = 1; } + elsif ($Line =~ m=^new file= || $Line =~ m=^deleted file= || $Line =~ m=^rename= || + $Line =~ m=diff.*tools/make_makefiles=) + { + $NeedMakeMakefiles = $NeedConfigure = 1; + } } close FH; } InfoMsg "Applying patch\n"; system("( cd $DataDir/wine && set -x && " . - " git apply --verbose $PatchFile " . + " git apply --verbose $PatchFile && " . + " git add -A " . ") >> $LogDir/Build.log 2>&1"); if ($? != 0) { @@ -125,6 +132,19 @@ sub ApplyPatch($$$) return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); } + if ($NeedMakeMakefiles) + { + InfoMsg "Running make_makefiles\n"; + system("( cd $DataDir/wine && set -x && " . + " ./tools/make_makefiles " . + ") >> $LogDir/Build.log 2>&1"); + if ($? != 0) + { + LogMsg "make_makefiles failed\n"; + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); + } + } + if ($NeedAutoconf && ! $NeedConfigure) { InfoMsg "Running autoconf\n"; -- 2.7.4

3 4

[PATCH] d3d10core/tests: Add test for combined clip and cull distances.
by Józef Kucia 13 Dec '17

13 Dec '17

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 207 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 207 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 7bbd7a7ecca8..ca0fd8be4997 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -13639,6 +13639,212 @@ static void test_clip_distance(void) release_test_context(&test_context); } +static void test_combined_clip_and_cull_distances(void) +{ + struct d3d10core_test_context test_context; + struct resource_readback rb; + unsigned int offset, stride; + ID3D10Device *device; + unsigned int i, j, k; + ID3D10Buffer *vb; + HRESULT hr; + + static const DWORD vs_code[] = + { +#if 0 + struct input + { + float4 position : POSITION; + float clip0 : CLIP_DISTANCE0; + float clip1 : CLIP_DISTANCE1; + float clip2 : CLIP_DISTANCE2; + float clip3 : CLIP_DISTANCE3; + float cull0 : CULL_DISTANCE0; + float cull1 : CULL_DISTANCE1; + float cull2 : CULL_DISTANCE2; + float cull3 : CULL_DISTANCE3; + }; + + struct vertex + { + float4 position : SV_Position; + float3 clip0 : SV_ClipDistance1; + float3 cull0 : SV_CullDistance1; + float clip1 : SV_ClipDistance2; + float cull1 : SV_CullDistance2; + }; + + void main(input vin, out vertex vertex) + { + vertex.position = vin.position; + vertex.clip0 = float3(vin.clip0, vin.clip1, vin.clip2); + vertex.cull0 = float3(vin.cull0, vin.cull1, vin.cull2); + vertex.clip1 = vin.clip3; + vertex.cull1 = vin.cull3; + } +#endif + 0x43425844, 0xa24fb3ea, 0x92e2c2b0, 0xb599b1b9, 0xd671f830, 0x00000001, 0x00000374, 0x00000003, + 0x0000002c, 0x0000013c, 0x000001f0, 0x4e475349, 0x00000108, 0x00000009, 0x00000008, 0x000000e0, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x000000e9, 0x00000000, 0x00000000, + 0x00000003, 0x00000001, 0x00000101, 0x000000e9, 0x00000001, 0x00000000, 0x00000003, 0x00000002, + 0x00000101, 0x000000e9, 0x00000002, 0x00000000, 0x00000003, 0x00000003, 0x00000101, 0x000000e9, + 0x00000003, 0x00000000, 0x00000003, 0x00000004, 0x00000101, 0x000000f7, 0x00000000, 0x00000000, + 0x00000003, 0x00000005, 0x00000101, 0x000000f7, 0x00000001, 0x00000000, 0x00000003, 0x00000006, + 0x00000101, 0x000000f7, 0x00000002, 0x00000000, 0x00000003, 0x00000007, 0x00000101, 0x000000f7, + 0x00000003, 0x00000000, 0x00000003, 0x00000008, 0x00000101, 0x49534f50, 0x4e4f4954, 0x494c4300, + 0x49445f50, 0x4e415453, 0x43004543, 0x5f4c4c55, 0x54534944, 0x45434e41, 0xababab00, 0x4e47534f, + 0x000000ac, 0x00000005, 0x00000008, 0x00000080, 0x00000000, 0x00000001, 0x00000003, 0x00000000, + 0x0000000f, 0x0000008c, 0x00000000, 0x00000002, 0x00000003, 0x00000001, 0x00000807, 0x0000008c, + 0x00000001, 0x00000002, 0x00000003, 0x00000001, 0x00000708, 0x0000009c, 0x00000000, 0x00000003, + 0x00000003, 0x00000002, 0x00000807, 0x0000009c, 0x00000001, 0x00000003, 0x00000003, 0x00000002, + 0x00000708, 0x505f5653, 0x7469736f, 0x006e6f69, 0x435f5653, 0x4470696c, 0x61747369, 0x0065636e, + 0x435f5653, 0x446c6c75, 0x61747369, 0x0065636e, 0x52444853, 0x0000017c, 0x00010040, 0x0000005f, + 0x0300005f, 0x001010f2, 0x00000000, 0x0300005f, 0x00101012, 0x00000001, 0x0300005f, 0x00101012, + 0x00000002, 0x0300005f, 0x00101012, 0x00000003, 0x0300005f, 0x00101012, 0x00000004, 0x0300005f, + 0x00101012, 0x00000005, 0x0300005f, 0x00101012, 0x00000006, 0x0300005f, 0x00101012, 0x00000007, + 0x0300005f, 0x00101012, 0x00000008, 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x04000067, + 0x00102072, 0x00000001, 0x00000002, 0x04000067, 0x00102082, 0x00000001, 0x00000002, 0x04000067, + 0x00102072, 0x00000002, 0x00000003, 0x04000067, 0x00102082, 0x00000002, 0x00000003, 0x05000036, + 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x05000036, 0x00102012, 0x00000001, 0x0010100a, + 0x00000001, 0x05000036, 0x00102022, 0x00000001, 0x0010100a, 0x00000002, 0x05000036, 0x00102042, + 0x00000001, 0x0010100a, 0x00000003, 0x05000036, 0x00102082, 0x00000001, 0x0010100a, 0x00000004, + 0x05000036, 0x00102012, 0x00000002, 0x0010100a, 0x00000005, 0x05000036, 0x00102022, 0x00000002, + 0x0010100a, 0x00000006, 0x05000036, 0x00102042, 0x00000002, 0x0010100a, 0x00000007, 0x05000036, + 0x00102082, 0x00000002, 0x0010100a, 0x00000008, 0x0100003e, + }; + static const D3D10_INPUT_ELEMENT_DESC layout_desc[] = + { + {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 0, DXGI_FORMAT_R32_FLOAT, 1, 0, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 1, DXGI_FORMAT_R32_FLOAT, 1, 4, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 2, DXGI_FORMAT_R32_FLOAT, 1, 8, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"CLIP_DISTANCE", 3, DXGI_FORMAT_R32_FLOAT, 1, 12, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"CULL_DISTANCE", 0, DXGI_FORMAT_R32_FLOAT, 1, 16, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"CULL_DISTANCE", 1, DXGI_FORMAT_R32_FLOAT, 1, 20, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"CULL_DISTANCE", 2, DXGI_FORMAT_R32_FLOAT, 1, 24, D3D10_INPUT_PER_VERTEX_DATA, 0}, + {"CULL_DISTANCE", 3, DXGI_FORMAT_R32_FLOAT, 1, 28, D3D10_INPUT_PER_VERTEX_DATA, 0}, + }; + struct + { + float clip_distance[4]; + float cull_distance[4]; + } + vertices[4] = + { + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + {{1.0f, 1.0f, 1.0f, 1.0f}, {1.0f, 1.0f, 1.0f, 1.0f}}, + }; + static const struct test + { + float vertices[4]; + BOOL triangle_visible[2]; + } + cull_distance_tests[] = + { + {{-1.0f, 1.0f, 1.0f, 1.0f}, {TRUE, TRUE}}, + {{ 1.0f, -1.0f, 1.0f, 1.0f}, {TRUE, TRUE}}, + {{ 1.0f, 1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{-1.0f, -1.0f, 1.0f, 1.0f}, {TRUE, TRUE}}, + {{-1.0f, 1.0f, -1.0f, 1.0f}, {TRUE, TRUE}}, + {{-1.0f, 1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{ 1.0f, -1.0f, -1.0f, 1.0f}, {TRUE, TRUE}}, + {{ 1.0f, -1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{ 1.0f, 1.0f, -1.0f, -1.0f}, {TRUE, TRUE}}, + + {{-1.0f, -1.0f, -1.0f, 1.0f}, {FALSE, TRUE}}, + {{-1.0f, -1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{-1.0f, -1.0f, 1.0f, -1.0f}, {TRUE, TRUE}}, + {{-1.0f, 1.0f, -1.0f, -1.0f}, {TRUE, TRUE}}, + {{ 1.0f, -1.0f, -1.0f, -1.0f}, {TRUE, FALSE}}, + + {{-1.0f, -1.0f, -1.0f, -1.0f}, {FALSE, FALSE}}, + }; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; + + if (!init_test_context(&test_context)) + return; + device = test_context.device; + + hr = ID3D10Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), + vs_code, sizeof(vs_code), &test_context.input_layout); + ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); + + vb = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(vertices), vertices); + stride = sizeof(*vertices); + offset = 0; + ID3D10Device_IASetVertexBuffers(device, 1, 1, &vb, &stride, &offset); + + hr = ID3D10Device_CreateVertexShader(device, vs_code, sizeof(vs_code), &test_context.vs); + ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + + for (i = 0; i < ARRAY_SIZE(vertices->cull_distance); ++i) + { + for (j = 0; j < ARRAY_SIZE(cull_distance_tests); ++j) + { + const struct test *test = &cull_distance_tests[j]; + unsigned int expected_color[ARRAY_SIZE(test->triangle_visible)]; + unsigned int color; + + for (k = 0; k < ARRAY_SIZE(vertices); ++k) + vertices[k].cull_distance[i] = test->vertices[k]; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)vb, 0, NULL, vertices, 0, 0); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_color_quad(&test_context, &green); + + for (k = 0; k < ARRAY_SIZE(expected_color); ++k) + expected_color[k] = test->triangle_visible[k] ? 0xff00ff00 : 0xffffffff; + + if (expected_color[0] == expected_color[1]) + { + check_texture_color(test_context.backbuffer, *expected_color, 1); + } + else + { + get_texture_readback(test_context.backbuffer, 0, &rb); + color = get_readback_color(&rb, 160, 240); + ok(color == expected_color[0], "Got unexpected color 0x%08x.\n", color); + color = get_readback_color(&rb, 480, 240); + ok(color == expected_color[1], "Got unexpected color 0x%08x.\n", color); + release_resource_readback(&rb); + } + } + + for (j = 0; j < ARRAY_SIZE(vertices); ++j) + vertices[j].cull_distance[i] = 1.0f; + } + + for (i = 0; i < ARRAY_SIZE(vertices->clip_distance); ++i) + { + for (j = 0; j < ARRAY_SIZE(vertices); ++j) + vertices[j].clip_distance[i] = -1.0f; + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)vb, 0, NULL, vertices, 0, 0); + + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xffffffff, 1); + + for (j = 0; j < ARRAY_SIZE(vertices); ++j) + vertices[j].clip_distance[i] = 1.0f; + } + + memset(vertices, 0, sizeof(vertices)); + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)vb, 0, NULL, vertices, 0, 0); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, white); + draw_color_quad(&test_context, &green); + check_texture_color(test_context.backbuffer, 0xff00ff00, 1); + + ID3D10Buffer_Release(vb); + release_test_context(&test_context); +} + START_TEST(device) { test_feature_level(); @@ -13716,4 +13922,5 @@ START_TEST(device) test_stream_output_resume(); test_format_compatibility(); test_clip_distance(); + test_combined_clip_and_cull_distances(); } -- 2.13.6

2 1

[PATCH] po: Update Norwegian translation (v2)
by Kim Malmo 13 Dec '17

13 Dec '17

v2: Contains additional translations, and supercedes previous uncommited changes Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 124 ++++++++++++++++++++++++------------------------------------ 1 file changed, 49 insertions(+), 75 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 300ee868cf..807c791ca0 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-19 16:00+0100\n" +"PO-Revision-Date: 2017-12-11 21:00+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -6962,7 +6962,7 @@ msgstr "Evaluerer startbetingelser" #: msi.rc:109 msgid "Migrating feature states from related applications" -msgstr "" +msgstr "Migrerer egenskapstilstand fra relaterte programmer" #: msi.rc:110 msgid "Moving files" @@ -6974,13 +6974,11 @@ msgstr "Publiserer assembly informasjon" #: msi.rc:112 msgid "Unpublishing assembly information" -msgstr "" +msgstr "Avpubliserer assembly informasjon" #: msi.rc:113 -#, fuzzy -#| msgid "Icon files" msgid "Patching files" -msgstr "Ikonfiler" +msgstr "Oppdaterer filer" #: msi.rc:114 msgid "Updating component registration" @@ -6992,7 +6990,7 @@ msgstr "Publiserer kvalifiserte komponenter" #: msi.rc:116 msgid "Publishing Product Features" -msgstr "" +msgstr "Publiserer produktegenskaper" #: msi.rc:117 msgid "Publishing product information" @@ -7008,7 +7006,7 @@ msgstr "Registrerer COM+ programmer og komponenter" #: msi.rc:120 msgid "Registering extension servers" -msgstr "" +msgstr "Registrerer utvidelsestjenere" #: msi.rc:121 msgid "Registering fonts" @@ -7024,7 +7022,7 @@ msgstr "Registrerer produkt" #: msi.rc:124 msgid "Registering program identifiers" -msgstr "" +msgstr "Registrerer programidentifikatorer" #: msi.rc:125 msgid "Registering type libraries" @@ -7039,10 +7037,8 @@ msgid "Removing duplicated files" msgstr "Fjerner duplikate filer" #: msi.rc:128 msi.rc:152 -#, fuzzy -#| msgid "Applying font settings" msgid "Updating environment strings" -msgstr "Aktiverer skriftinnstillinger" +msgstr "Oppdaterer miljøvariabler" #: msi.rc:129 msgid "Removing applications" @@ -7058,7 +7054,7 @@ msgstr "Fjerner mapper" #: msi.rc:132 msgid "Removing INI files entries" -msgstr "" +msgstr "Fjerner INI filoppføringer" #: msi.rc:133 msgid "Removing ODBC components" @@ -7098,7 +7094,7 @@ msgstr "Avpubliserer kvalifiserte komponenter" #: msi.rc:143 msgid "Unpublishing Product Features" -msgstr "" +msgstr "Avpubliserer produktegenskaper" #: msi.rc:144 msgid "Unpublishing product information" @@ -7114,7 +7110,7 @@ msgstr "Avregistrerer COM+ programmer og komponenter" #: msi.rc:147 msgid "Unregistering extension servers" -msgstr "" +msgstr "Avregistrerer utvidelsestjenere" #: msi.rc:148 msgid "Unregistering fonts" @@ -7126,7 +7122,7 @@ msgstr "Avregistrerer MIME informasjon" #: msi.rc:150 msgid "Unregistering program identifiers" -msgstr "" +msgstr "Avregistrerer programidentifikatorer" #: msi.rc:151 msgid "Unregistering type libraries" @@ -7134,7 +7130,7 @@ msgstr "Avregistrerer typebibliotek" #: msi.rc:153 msgid "Writing INI files values" -msgstr "" +msgstr "Skriver INI filverdier" #: msi.rc:154 msgid "Writing system registry values" @@ -7146,7 +7142,7 @@ msgstr "Plass ledig: [1]" #: msi.rc:161 msgid "Property: [1], Signature: [2]" -msgstr "" +msgstr "Egenskap: [1], Signatur: [2]" #: msi.rc:162 msgid "File: [1]" @@ -7190,7 +7186,7 @@ msgstr "Program: [1]" #: msi.rc:174 msi.rc:175 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "" +msgstr "Programkontekst:[1], Assemblynavn:[2]" #: msi.rc:176 msgid "File: [1], Directory: [2], Size: [3]" @@ -7198,19 +7194,19 @@ msgstr "Fil: [1], Mappe: [2], Størrelse: [6]" #: msi.rc:177 msi.rc:198 msgid "Component ID: [1], Qualifier: [2]" -msgstr "" +msgstr "Komponent ID: [1], Kvalifiserer: [2]" #: msi.rc:178 msi.rc:199 msgid "Feature: [1]" -msgstr "" +msgstr "Egenskap: [1]" #: msi.rc:179 msi.rc:200 msgid "Class Id: [1]" -msgstr "" +msgstr "Klasse ID: [1]" #: msi.rc:180 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2], Brukere: [3], RSN: [4]}" #: msi.rc:181 msi.rc:202 msgid "Extension: [1]" @@ -7222,7 +7218,7 @@ msgstr "Skrift: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "" +msgstr "MIME innholdstype: [1], Utvidelse: [2]" #: msi.rc:184 msi.rc:205 msgid "ProgId: [1]" @@ -7234,27 +7230,27 @@ msgstr "" #: msi.rc:186 msi.rc:189 msgid "File: [1], Directory: [9]" -msgstr "" +msgstr "Fil: [1], Mappe: [2]" #: msi.rc:187 msi.rc:207 msgid "Name: [1], Value: [2], Action [3]" -msgstr "" +msgstr "Navn: [1], Verdi: [2], Handling [3]" #: msi.rc:188 msgid "Application: [1], Command line: [2]" -msgstr "" +msgstr "Program: [1], Kommandolinje: [2]" #: msi.rc:191 msi.rc:208 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "" +msgstr "Fil: [1], Seksjon: [2], Nøkkel: [3], Verdi: [4]" #: msi.rc:192 msgid "Key: [1], Name: [2]" -msgstr "" +msgstr "Nøkkel: [1], Navn: [2]" #: msi.rc:194 msi.rc:195 msgid "File: [1], Folder: [2]" -msgstr "" +msgstr "Fil: [1], Mappe: [2]" #: msi.rc:201 msgid "AppId: [1]{{, AppType: [2]}}" @@ -7262,7 +7258,7 @@ msgstr "" #: msi.rc:209 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "" +msgstr "Nøkkel: [1], Navn: [2], Verdi: [3]" #: msi.rc:71 msgid "{{Fatal error: }}" @@ -7286,6 +7282,9 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"Installeren har truffet på ett eventet problem under installeringen av denne " +"pakken. Dette kan skyldes ett problem med denne pakken. Errorkoden er [1]. {{" +"Argumentene er: [2], [3], [4]}}" #: msi.rc:76 msgid "{{Disk full: }}" @@ -7293,33 +7292,35 @@ msgstr "{{Disken er full: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" -msgstr "" +msgstr "Handling [Tid]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "" +msgstr "Meldingstype: [1], Argument: [2]{, [3]" #: msi.rc:81 msgid "=== Logging started: [Date] [Time] ===" -msgstr "" +msgstr "=== Logging startet: [Dato] [Tid] ===" #: msi.rc:79 msgid "Action start [Time]: [1]." -msgstr "" +msgstr "Handling startet [Tid]: [1]." #: msi.rc:80 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "" +msgstr "Handling avsluttet [Tid]: [1]. Returnert verdi [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Vennligst sett inn disk: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"Kildefil ikke funnet{{(cabinet)}}: [2]. Bekreft at den finnes og at du har " +"tilgang til den." #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8923,10 +8924,8 @@ msgid " sec" msgstr " sek" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Velg mappe" +msgstr "Velg kilde" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" @@ -12039,17 +12038,6 @@ msgid "Icons (*.ico)" msgstr "Ikoner (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12065,7 +12053,7 @@ msgstr "" " REG [operasjon] [parametere]\n" "\n" "Støttede operasjoner:\n" -" ADD | DELETE | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "For hjelp med spesifikke operasjoner, skriv:\n" " REG [operasjon] /?\n" @@ -12195,43 +12183,31 @@ msgstr "(verdi ikke oppgitt)" #: reg.rc:66 msgid "REG IMPORT file.reg\n" -msgstr "" +msgstr "REG IMPORT fil.reg\n" #: reg.rc:67 -#, fuzzy -#| msgid "regedit: The file '%1' was not found.\n" msgid "reg: The file '%1' was not found.\n" -msgstr "regedit: Filen \"%1\" ble ikke funnet.\n" +msgstr "reg: Filen \"%1\" ble ikke funnet.\n" #: reg.rc:68 -#, fuzzy -#| msgid "regedit: Unable to open the registry key '%1'.\n" msgid "reg: Unable to open the registry key '%1'.\n" -msgstr "regedit: Kan ikke åpne registernøkkelen \"%1\".\n" +msgstr "reg: Kan ikke åpne registernøkkelen \"%1\".\n" #: reg.rc:69 -#, fuzzy -#| msgid "regedit: Unrecognized escape sequence [\\%1!c!]\n" msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" -msgstr "regedit: Ukjent escape-sekvens [\\%1!c!]\n" +msgstr "reg: Ukjent escape-sekvens [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG QUERY key_name [/v value_name | /ve] [/s]\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG QUERY nøkkelnavn [/v verdi | /ve] [/s]\n" +msgstr "REG EXPORT nøkkelnavn fil.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "regedit: Invalid system key [%1]\n" msgid "reg: Invalid system key [%1]\n" -msgstr "regedit: Ugyldig systemnøkkel [%1]\n" +msgstr "reg: Ugyldig systemnøkkel [%1]\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "Registerverdien \"%1\" finnes fra før. Vil du erstatte den?" +msgstr "Filen \"%1\" finnes fra før. Vil du erstatte den?" #: regedit.rc:34 msgid "&Registry" @@ -15003,10 +14979,8 @@ msgid "Expert" msgstr "Ekspert" #: winemine.rc:74 winemine.rc:33 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "Resultat" +msgstr "Tilbakestill resultater" #: winemine.rc:80 msgid "Congratulations!" @@ -15034,7 +15008,7 @@ msgstr "Miner" #: winemine.rc:34 msgid "All results will be lost. Are you sure?" -msgstr "" +msgstr "Alle resultater vil bli tapt. Er du sikker?" #: winemine.rc:30 msgid "WineMine" -- 2.14.1

1 0

[PATCH] wsdapi/tests: Register an exception with the firewall to avoid a dialog.
by Hans Leidekker 13 Dec '17

13 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 140 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index db5947d605..f373510a76 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -27,6 +27,7 @@ #include "initguid.h" #include "objbase.h" #include "wsdapi.h" +#include <netfw.h> typedef struct IWSDiscoveryPublisherNotifyImpl { IWSDiscoveryPublisherNotify IWSDiscoveryPublisherNotify_iface; @@ -276,8 +277,146 @@ static void Publish_tests(void) IWSDiscoveryPublisherNotify_Release(sink2); } +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'w','s','d','a','p','i','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + START_TEST(discovery) { + BOOL firewall_enabled = is_firewall_enabled(); + HRESULT hr; + + if (firewall_enabled) + { + if (!is_process_elevated()) + { + skip("no privileges, skipping tests to avoid firewall dialog\n"); + return; + } + if ((hr = set_firewall(APP_ADD)) != S_OK) + { + skip("can't authorize app in firewall %08x\n", hr); + return; + } + } + CoInitialize(NULL); CreateDiscoveryPublisher_tests(); @@ -285,4 +424,5 @@ START_TEST(discovery) Publish_tests(); CoUninitialize(); + if (firewall_enabled) set_firewall(APP_REMOVE); } -- 2.11.0

2 1

[PATCH] kerberos: Add support for KerbQueryTicketCacheMessage.
by Dmitry Timoshkov 13 Dec '17

13 Dec '17

Based on the code written by George Popoff. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kerberos/krb5_ap.c | 329 +++++++++++++++++++++++++++++++++++++++++++++++- include/ntsecapi.h | 105 ++++++++++++++++ 2 files changed, 431 insertions(+), 3 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 0134b94f6d..3ee2cf05b7 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -1,5 +1,6 @@ /* * Copyright 2017 Dmitry Timoshkov + * Copyright 2017 George Popoff * * Kerberos5 Authentication Package * @@ -30,6 +31,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "sspi.h" #include "ntsecapi.h" #include "ntsecpkg.h" @@ -48,8 +50,43 @@ static void *libkrb5_handle; #define MAKE_FUNCPTR(f) static typeof(f) * p_##f MAKE_FUNCPTR(krb5_init_context); +MAKE_FUNCPTR(krb5_free_context); +MAKE_FUNCPTR(krb5_free_ticket); +MAKE_FUNCPTR(krb5_cccol_cursor_new); +MAKE_FUNCPTR(krb5_cccol_cursor_next); +MAKE_FUNCPTR(krb5_cccol_cursor_free); +MAKE_FUNCPTR(krb5_cc_close); +MAKE_FUNCPTR(krb5_cc_start_seq_get); +MAKE_FUNCPTR(krb5_cc_end_seq_get); +MAKE_FUNCPTR(krb5_cc_next_cred); +MAKE_FUNCPTR(krb5_is_config_principal); +MAKE_FUNCPTR(krb5_decode_ticket); +MAKE_FUNCPTR(krb5_unparse_name_flags); +MAKE_FUNCPTR(krb5_free_unparsed_name); +MAKE_FUNCPTR(krb5_free_cred_contents); #undef MAKE_FUNCPTR +static void *heap_alloc(SIZE_T size) +{ + return HeapAlloc(GetProcessHeap(), 0, size); +} + +static void *heap_realloc(void *p, SIZE_T size) +{ + return HeapReAlloc(GetProcessHeap(), 0, p, size); +} + +static void heap_free(void *p) +{ + HeapFree(GetProcessHeap(), 0, p); +} + +struct ticket_info +{ + ULONG count, allocated; + KERB_TICKET_CACHE_INFO *info; +}; + static void load_krb5(void) { if (!(libkrb5_handle = wine_dlopen(SONAME_LIBKRB5, RTLD_NOW, NULL, 0))) @@ -66,6 +103,20 @@ static void load_krb5(void) } LOAD_FUNCPTR(krb5_init_context) + LOAD_FUNCPTR(krb5_free_context) + LOAD_FUNCPTR(krb5_free_ticket) + LOAD_FUNCPTR(krb5_cccol_cursor_new) + LOAD_FUNCPTR(krb5_cccol_cursor_next) + LOAD_FUNCPTR(krb5_cccol_cursor_free) + LOAD_FUNCPTR(krb5_cc_close) + LOAD_FUNCPTR(krb5_cc_start_seq_get) + LOAD_FUNCPTR(krb5_cc_end_seq_get) + LOAD_FUNCPTR(krb5_cc_next_cred) + LOAD_FUNCPTR(krb5_is_config_principal) + LOAD_FUNCPTR(krb5_decode_ticket) + LOAD_FUNCPTR(krb5_unparse_name_flags) + LOAD_FUNCPTR(krb5_free_unparsed_name) + LOAD_FUNCPTR(krb5_free_cred_contents) #undef LOAD_FUNCPTR return; @@ -111,15 +162,287 @@ static NTSTATUS NTAPI krb5_LsaApInitializePackage(ULONG package_id, PLSA_DISPATC return STATUS_SUCCESS; } +static NTSTATUS krb5_error_to_status(krb5_error_code error) +{ + switch (error) + { + case 0: return STATUS_SUCCESS; + default: + /* FIXME */ + return STATUS_UNSUCCESSFUL; + } +} + +static WCHAR *utf8_to_wstr(const char *utf8) +{ + int len; + WCHAR *wstr; + + len = MultiByteToWideChar(CP_UTF8, 0, utf8, -1, NULL, 0); + wstr = heap_alloc(len * sizeof(WCHAR)); + if (wstr) + MultiByteToWideChar(CP_UTF8, 0, utf8, -1, wstr, len); + + return wstr; +} + +static NTSTATUS copy_tickets_from_cache(krb5_context context, krb5_ccache cache, struct ticket_info *info) +{ + NTSTATUS status; + krb5_cc_cursor cursor; + krb5_error_code error; + krb5_creds credentials; + krb5_ticket *ticket; + char *name_with_realm, *name_without_realm, *realm_name; + WCHAR *realm_nameW, *name_without_realmW; + + error = p_krb5_cc_start_seq_get(context, cache, &cursor); + if (error) return krb5_error_to_status(error); + + for (;;) + { + error = p_krb5_cc_next_cred(context, cache, &cursor, &credentials); + if (error) + { + if (error == KRB5_CC_END) + status = STATUS_SUCCESS; + else + status = krb5_error_to_status(error); + break; + } + + if (p_krb5_is_config_principal(context, credentials.server)) + { + p_krb5_free_cred_contents(context, &credentials); + continue; + } + + if (info->count == info->allocated) + { + KERB_TICKET_CACHE_INFO *new_info; + ULONG new_allocated; + + if (info->allocated) + { + new_allocated = info->allocated * 2; + new_info = heap_realloc(info->info, sizeof(*new_info) * new_allocated); + } + else + { + new_allocated = 16; + new_info = heap_alloc(sizeof(*new_info) * new_allocated); + } + if (!new_info) + { + p_krb5_free_cred_contents(context, &credentials); + status = STATUS_NO_MEMORY; + break; + } + + info->info = new_info; + info->allocated = new_allocated; + } + + error = p_krb5_unparse_name_flags(context, credentials.server, 0, &name_with_realm); + if (error) + { + p_krb5_free_cred_contents(context, &credentials); + status = krb5_error_to_status(error); + break; + } + + TRACE("name_with_realm: %s\n", debugstr_a(name_with_realm)); + + error = p_krb5_unparse_name_flags(context, credentials.server, + KRB5_PRINCIPAL_UNPARSE_NO_REALM, &name_without_realm); + if (error) + { + p_krb5_free_unparsed_name(context, name_with_realm); + p_krb5_free_cred_contents(context, &credentials); + status = krb5_error_to_status(error); + break; + } + + TRACE("name_without_realm: %s\n", debugstr_a(name_without_realm)); + + name_without_realmW = utf8_to_wstr(name_without_realm); + RtlInitUnicodeString(&info->info[info->count].ServerName, name_without_realmW); + + realm_name = strchr(name_with_realm, '@'); + if (!realm_name) + { + ERR("wrong name with realm %s\n", debugstr_a(name_with_realm)); + realm_name = name_with_realm; + } + else + realm_name++; + + /* realm_name - now contains only realm! */ + + realm_nameW = utf8_to_wstr(realm_name); + RtlInitUnicodeString(&info->info[info->count].RealmName, realm_nameW); + + if (!credentials.times.starttime) + credentials.times.starttime = credentials.times.authtime; + + /* TODO: if krb5_is_config_principal = true */ + RtlSecondsSince1970ToTime(credentials.times.starttime, &info->info[info->count].StartTime); + RtlSecondsSince1970ToTime(credentials.times.endtime, &info->info[info->count].EndTime); + RtlSecondsSince1970ToTime(credentials.times.renew_till, &info->info[info->count].RenewTime); + + info->info[info->count].TicketFlags = credentials.ticket_flags; + + error = p_krb5_decode_ticket(&credentials.ticket, &ticket); + + p_krb5_free_unparsed_name(context, name_with_realm); + p_krb5_free_unparsed_name(context, name_without_realm); + p_krb5_free_cred_contents(context, &credentials); + + if (error) + { + status = krb5_error_to_status(error); + break; + } + + info->info[info->count].EncryptionType = ticket->enc_part.enctype; + + p_krb5_free_ticket(context, ticket); + + info->count++; + } + + p_krb5_cc_end_seq_get(context, cache, &cursor); + + return status; +} + +static NTSTATUS query_ticket_cache(PLSA_CLIENT_REQUEST lsa_req, void *in, ULONG in_len, void **out, ULONG *out_len) +{ + NTSTATUS status; + KERB_QUERY_TKT_CACHE_REQUEST *query; + struct ticket_info info; + krb5_error_code error; + krb5_context context = NULL; + krb5_cccol_cursor cursor = NULL; + krb5_ccache cache; + + if (!in || in_len != sizeof(KERB_QUERY_TKT_CACHE_REQUEST) || !out || !out_len) + return STATUS_INVALID_PARAMETER; + + query = (KERB_QUERY_TKT_CACHE_REQUEST *)in; + + if (query->LogonId.HighPart != 0 || query->LogonId.LowPart != 0) + return STATUS_ACCESS_DENIED; + + info.count = 0; + info.allocated = 0; + info.info = NULL; + + error = p_krb5_init_context(&context); + if (error) + { + status = krb5_error_to_status(error); + goto done; + } + + error = p_krb5_cccol_cursor_new(context, &cursor); + if (error) + { + status = krb5_error_to_status(error); + goto done; + } + + for (;;) + { + error = p_krb5_cccol_cursor_next(context, cursor, &cache); + if (error) + { + status = krb5_error_to_status(error); + goto done; + } + if (!cache) break; + + status = copy_tickets_from_cache(context, cache, &info); + + p_krb5_cc_close(context, cache); + + if (status != STATUS_SUCCESS) + goto done; + } + + /* FIXME: copy server/realm names to client space as well. + * As long as LSA works in current process space it's OK. + */ + + *out_len = sizeof(KERB_QUERY_TKT_CACHE_RESPONSE); + if (info.count > 1) + *out_len += sizeof(KERB_TICKET_CACHE_INFO) * (info.count - 1); + status = lsa_dispatch.AllocateClientBuffer(lsa_req, *out_len, out); + if (status == STATUS_SUCCESS) + { + KERB_QUERY_TKT_CACHE_RESPONSE resp; + + resp.MessageType = KerbQueryTicketCacheMessage; + resp.CountOfTickets = info.count; + + status = lsa_dispatch.CopyToClientBuffer(lsa_req, sizeof(ULONG) * 2, *out, &resp); + if (status == STATUS_SUCCESS) + status = lsa_dispatch.CopyToClientBuffer(lsa_req, + sizeof(KERB_TICKET_CACHE_INFO) * info.count, (char *)*out + sizeof(ULONG) * 2, info.info); + + if (status != STATUS_SUCCESS) + lsa_dispatch.FreeClientBuffer(lsa_req, *out); + } + +done: + if (cursor) + p_krb5_cccol_cursor_free(context, &cursor); + + if (context) + p_krb5_free_context(context); + + heap_free(info.info); + + return status; +} + static NTSTATUS NTAPI krb5_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST request, PVOID in_buffer, PVOID client_buffer_base, ULONG in_buffer_length, PVOID *out_buffer, PULONG out_buffer_length, PNTSTATUS status) { - FIXME("%p,%p,%p,%u,%p,%p,%p: stub\n", request, in_buffer, client_buffer_base, + KERB_PROTOCOL_MESSAGE_TYPE msg; + + TRACE("%p,%p,%p,%u,%p,%p,%p\n", request, in_buffer, client_buffer_base, in_buffer_length, out_buffer, out_buffer_length, status); - *status = STATUS_NOT_IMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + if (!in_buffer || in_buffer_length < sizeof(msg)) + return STATUS_INVALID_PARAMETER; + + msg = *(KERB_PROTOCOL_MESSAGE_TYPE *)in_buffer; + + switch(msg) + { + case KerbQueryTicketCacheMessage: + *status = query_ticket_cache(request, in_buffer, in_buffer_length, out_buffer, out_buffer_length); + break; + + case KerbRetrieveTicketMessage: + FIXME("KerbRetrieveTicketMessage stub\n"); + *status = STATUS_NOT_IMPLEMENTED; + break; + + case KerbPurgeTicketCacheMessage: + FIXME("KerbPurgeTicketCacheMessage stub\n"); + *status = STATUS_NOT_IMPLEMENTED; + break; + + default: /* All other requests should call LsaApCallPackage */ + WARN("%u => access denied\n", msg); + *status = STATUS_ACCESS_DENIED; + break; + } + + return *status; } static SECPKG_FUNCTION_TABLE krb5_table = diff --git a/include/ntsecapi.h b/include/ntsecapi.h index 36357c61b4..463bedf09a 100644 --- a/include/ntsecapi.h +++ b/include/ntsecapi.h @@ -169,6 +169,15 @@ typedef struct _OBJECT_ATTRIBUTES { } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; #endif +#ifndef __SECHANDLE_DEFINED__ +#define __SECHANDLE_DEFINED__ +typedef struct _SecHandle +{ + ULONG_PTR dwLower; + ULONG_PTR dwUpper; +} SecHandle, *PSecHandle; +#endif + typedef UNICODE_STRING LSA_UNICODE_STRING, *PLSA_UNICODE_STRING; typedef STRING LSA_STRING, *PLSA_STRING; typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES; @@ -352,6 +361,102 @@ static const WCHAR MICROSOFT_KERBEROS_NAME_W[] = { 'K','e','r','b','e','r','o',' #define MICROSOFT_KERBEROS_NAME_A "Kerberos" #endif +#define KERB_TICKET_FLAGS_reserved 0x80000000 +#define KERB_TICKET_FLAGS_forwardable 0x40000000 +#define KERB_TICKET_FLAGS_forwarded 0x20000000 +#define KERB_TICKET_FLAGS_proxiable 0x10000000 +#define KERB_TICKET_FLAGS_proxy 0x08000000 +#define KERB_TICKET_FLAGS_may_postdate 0x04000000 +#define KERB_TICKET_FLAGS_postdated 0x02000000 +#define KERB_TICKET_FLAGS_invalid 0x01000000 +#define KERB_TICKET_FLAGS_renewable 0x00800000 +#define KERB_TICKET_FLAGS_initial 0x00400000 +#define KERB_TICKET_FLAGS_pre_authent 0x00200000 +#define KERB_TICKET_FLAGS_hw_authent 0x00100000 +#define KERB_TICKET_FLAGS_ok_as_delegate 0x00040000 +#define KERB_TICKET_FLAGS_name_canonicalize 0x00010000 +#define KERB_TICKET_FLAGS_cname_in_pa_data 0x00040000 +#define KERB_TICKET_FLAGS_reserved1 0x00000001 + +typedef enum _KERB_PROTOCOL_MESSAGE_TYPE +{ + KerbDebugRequestMessage = 0, + KerbQueryTicketCacheMessage, + KerbChangeMachinePasswordMessage, + KerbVerifyPacMessage, + KerbRetrieveTicketMessage, + KerbUpdateAddressesMessage, + KerbPurgeTicketCacheMessage, + KerbChangePasswordMessage, + KerbRetrieveEncodedTicketMessage, + KerbDecryptDataMessage, + KerbAddBindingCacheEntryMessage, + KerbSetPasswordMessage, + KerbSetPasswordExMessage, + KerbVerifyCredentialsMessage, + KerbQueryTicketCacheExMessage, + KerbPurgeTicketCacheExMessage, + KerbRefreshSmartcardCredentialsMessage, + KerbAddExtraCredentialsMessage, + KerbQuerySupplementalCredentialsMessage, + KerbTransferCredentialsMessage, + KerbQueryTicketCacheEx2Message, + KerbSubmitTicketMessage, + KerbAddExtraCredentialsExMessage, + KerbQueryKdcProxyCacheMessage, + KerbPurgeKdcProxyCacheMessage, + KerbQueryTicketCacheEx3Message, + KerbCleanupMachinePkinitCredsMessage, + KerbAddBindingCacheEntryExMessage, + KerbQueryBindingCacheMessage, + KerbPurgeBindingCacheMessage, + KerbQueryDomainExtendedPoliciesMessage, + KerbQueryS4U2ProxyCacheMessage +} KERB_PROTOCOL_MESSAGE_TYPE, *PKERB_PROTOCOL_MESSAGE_TYPE; + +typedef struct _KERB_TICKET_CACHE_INFO +{ + UNICODE_STRING ServerName; + UNICODE_STRING RealmName; + LARGE_INTEGER StartTime; + LARGE_INTEGER EndTime; + LARGE_INTEGER RenewTime; + LONG EncryptionType; + ULONG TicketFlags; +} KERB_TICKET_CACHE_INFO, *PKERB_TICKET_CACHE_INFO; + +typedef struct _KERB_QUERY_TKT_CACHE_REQUEST +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + LUID LogonId; +} KERB_QUERY_TKT_CACHE_REQUEST, *PKERB_QUERY_TKT_CACHE_REQUEST; + +typedef struct _KERB_QUERY_TKT_CACHE_RESPONSE +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + ULONG CountOfTickets; + KERB_TICKET_CACHE_INFO Tickets[ANYSIZE_ARRAY]; +} KERB_QUERY_TKT_CACHE_RESPONSE, *PKERB_QUERY_TKT_CACHE_RESPONSE; + +typedef struct _KERB_RETRIEVE_TKT_REQUEST +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + LUID LogonId; + UNICODE_STRING TargetName; + ULONG TicketFlags; + ULONG CacheOptions; + LONG EncryptionType; + SecHandle CredentialsHandle; +} KERB_RETRIEVE_TKT_REQUEST, *PKERB_RETRIEVE_TKT_REQUEST; + +typedef struct _KERB_PURGE_TKT_CACHE_REQUEST +{ + KERB_PROTOCOL_MESSAGE_TYPE MessageType; + LUID LogonId; + UNICODE_STRING ServerName; + UNICODE_STRING RealmName; +} KERB_PURGE_TKT_CACHE_REQUEST, *PKERB_PURGE_TKT_CACHE_REQUEST; + #define RtlGenRandom SystemFunction036 #define RtlEncryptMemory SystemFunction040 #define RtlDecryptMemory SystemFunction041 -- 2.15.1

2 2

[PATCH] user.exe16: InsertMenu16 updated to handle HBITMAPs which applications
by Martin Payne 13 Dec '17

13 Dec '17

have incorrectly cast (LPSTR)hBitmap rather than (LPSTR)(LONG)hBitmap. Tested on Fedora 26 x86. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> --- dlls/user.exe16/user.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index eac4a19d39..bc1ce0b5dd 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -2396,7 +2396,12 @@ BOOL16 WINAPI InsertMenu16( HMENU16 hMenu, UINT16 pos, UINT16 flags, if ((pos == (UINT16)-1) && (flags & MF_BYPOSITION)) pos32 = (UINT)-1; if (IS_MENU_STRING_ITEM(flags) && data) return InsertMenuA( HMENU_32(hMenu), pos32, flags, id, MapSL(data) ); - return InsertMenuA( HMENU_32(hMenu), pos32, flags, id, (LPSTR)data ); + + /* If "data" is an HBITMAP, the high WORD will contain the application's DGROUP selector if the application cast + (LPSTR)hBitmap rather than (LPSTR)(LONG)hBitmap. This works ok in Win16 but results in an invalid handle in 32 + bit code. Therefore the high WORD is masked off when "data" is an HBITMAP. */ + return InsertMenuA( HMENU_32(hMenu), pos32, flags, id, + ((flags & MF_BITMAP) == MF_BITMAP) ? (LPSTR)(data & 0xFFFF) : (LPSTR)data ); } -- 2.15.1.windows.2

1 0

[PATCH] user.exe16: Implemented OldExitWindows() user.exe16 function.
by Martin Payne 13 Dec '17

13 Dec '17

Tested on Fedora 26 x86. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> --- dlls/user.exe16/user.c | 9 +++++++++ dlls/user.exe16/user.exe16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index eac4a19d39..729e973ab2 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -510,6 +510,15 @@ static void free_clipboard_formats(void) } +/*********************************************************************** + * OldExitWindows (USER.2) + */ +void WINAPI OldExitWindows16(void) +{ + ExitWindows16(0, 0); +} + + /********************************************************************** * InitApp (USER.5) */ diff --git a/dlls/user.exe16/user.exe16.spec b/dlls/user.exe16/user.exe16.spec index 8d928bc7d9..ec571800e7 100644 --- a/dlls/user.exe16/user.exe16.spec +++ b/dlls/user.exe16/user.exe16.spec @@ -1,5 +1,5 @@ 1 pascal -ret16 MessageBox(word str str word) MessageBox16 -2 stub OldExitWindows +2 pascal -ret16 OldExitWindows() OldExitWindows16 3 stub EnableOEMLayer 4 stub DisableOEMLayer 5 pascal -ret16 InitApp(word) InitApp16 -- 2.15.1.windows.2

1 0

[PATCH] krnl386.exe16: Shared libraries have a ".exe" rather than ".dll" file
by Martin Payne 13 Dec '17

13 Dec '17

extension on Windows < 3.0. Tested on Fedora 26 x86. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> --- dlls/krnl386.exe16/ne_module.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index 70f8a46467..14f8075166 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -788,9 +788,9 @@ static BOOL NE_LoadDLLs( NE_MODULE *pModule ) /* its handle in the list of DLLs to initialize. */ HMODULE16 hDLL; - /* Append .DLL to name if no extension present */ + /* Append .DLL (Windows >= 3.00) or .EXE (Windows < 3.00) to name if no extension present */ if (!(p = strrchr( buffer, '.')) || strchr( p, '/' ) || strchr( p, '\\')) - strcat( buffer, ".DLL" ); + strcat( buffer, (GetExeVersion16() >= 0x0300) ? ".DLL" : ".EXE" ); if ((hDLL = MODULE_LoadModule16( buffer, TRUE, TRUE )) < 32) { @@ -988,7 +988,7 @@ static HINSTANCE16 MODULE_LoadModule16( LPCSTR libname, BOOL implicit, BOOL lib_ strcpy( dllname, basename ); q = strrchr( dllname, '.' ); - if (!q) strcat( dllname, ".dll" ); + if (!q) strcat( dllname, (GetExeVersion16() >= 0x0300) ? ".dll" : ".exe" ); for (q = dllname; *q; q++) if (*q >= 'A' && *q <= 'Z') *q += 32; strcpy( q, "16" ); -- 2.15.1.windows.2

1 0

[PATCH] kernel32: Prevent MODULE_Decide_OS2_OldWin() fallthrough which causes
by Martin Payne 13 Dec '17

13 Dec '17

valid non-Win16 New Executables (e.g. OS/2) to be reported as broken. Clarified FIXME and made whitespace consistent around code which was updated. Tested on Fedora 26 x86. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> --- dlls/kernel32/module.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index b4d5fe7c2e..93ac32f6d3 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -253,8 +253,8 @@ BOOL WINAPI DisableThreadLibraryCalls( HMODULE hModule ) /* Check whether a file is an OS/2 or a very old Windows executable * by testing on import of KERNEL. * - * FIXME: is reading the module imports the only way of discerning - * old Windows binaries from OS/2 ones ? At least it seems so... + * Reading the module imports is the only reasonable way of discerning + * old Windows binaries from OS/2 ones. */ static DWORD MODULE_Decide_OS2_OldWin(HANDLE hfile, const IMAGE_DOS_HEADER *mz, const IMAGE_OS2_HEADER *ne) { @@ -281,16 +281,18 @@ static DWORD MODULE_Decide_OS2_OldWin(HANDLE hfile, const IMAGE_DOS_HEADER *mz, for (i=0; i < ne->ne_cmod; i++) { - LPSTR module = &nametab[modtab[i]]; - TRACE("modref: %.*s\n", module[0], &module[1]); - if (!(strncmp(&module[1], "KERNEL", module[0]))) - { /* very old Windows file */ - MESSAGE("This seems to be a very old (pre-3.0) Windows executable. Expect crashes, especially if this is a real-mode binary !\n"); + LPSTR module = &nametab[modtab[i]]; + TRACE("modref: %.*s\n", module[0], &module[1]); + if (!(strncmp(&module[1], "KERNEL", module[0]))) + { /* very old Windows file */ + MESSAGE("This seems to be a very old (pre-3.0) Windows executable. Expect crashes, especially if this is a real-mode binary !\n"); ret = BINARY_WIN16; - goto good; - } + break; + } } + goto good; + broken: ERR("Hmm, an error occurred. Is this binary file broken?\n"); -- 2.15.1.windows.2

1 0

[PATCH] msvcrt: Fix copypaste typos in arm64 setjmp/longjmp
by Martin Storsjo 13 Dec '17

13 Dec '17

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/msvcrt/except_arm64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index b024d49..904d006 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -150,7 +150,7 @@ __ASM_GLOBAL_FUNC(MSVCRT__setjmpex, "str x24, [x0, #0x38]\n\t" /* jmp_buf->X24 */ "str x25, [x0, #0x40]\n\t" /* jmp_buf->X25 */ "str x26, [x0, #0x48]\n\t" /* jmp_buf->X26 */ - "str x26, [x0, #0x50]\n\t" /* jmp_buf->X27 */ + "str x27, [x0, #0x50]\n\t" /* jmp_buf->X27 */ "str x28, [x0, #0x58]\n\t" /* jmp_buf->X28 */ "str x29, [x0, #0x60]\n\t" /* jmp_buf->Fp */ "str x30, [x0, #0x68]\n\t" /* jmp_buf->Lr */ @@ -182,7 +182,7 @@ __ASM_GLOBAL_FUNC(longjmp_set_regs, "ldr x24, [x0, #0x38]\n\t" /* jmp_buf->X24 */ "ldr x25, [x0, #0x40]\n\t" /* jmp_buf->X25 */ "ldr x26, [x0, #0x48]\n\t" /* jmp_buf->X26 */ - "ldr x26, [x0, #0x50]\n\t" /* jmp_buf->X27 */ + "ldr x27, [x0, #0x50]\n\t" /* jmp_buf->X27 */ "ldr x28, [x0, #0x58]\n\t" /* jmp_buf->X28 */ "ldr x29, [x0, #0x60]\n\t" /* jmp_buf->Fp */ "ldr x30, [x0, #0x68]\n\t" /* jmp_buf->Lr */ -- 2.7.4

1 0

[PATCH 3/3] [v2] tzres: Add resource-only DLL for time zone names and use it.
by Akihiro Sagawa 13 Dec '17

13 Dec '17

In version 2, add test code updates. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- configure | 2 + configure.ac | 1 + dlls/ntdll/tests/time.c | 8 +- dlls/tzres/Makefile.in | 2 + dlls/tzres/tzres.rc | 245 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/tzres/tzres.spec | 1 + loader/wine.inf.in | 208 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 463 insertions(+), 4 deletions(-) create mode 100644 dlls/tzres/Makefile.in create mode 100644 dlls/tzres/tzres.rc create mode 100644 dlls/tzres/tzres.spec

2 1

[PATCH 2/2] bcrypt: Add some crypto-provider related stubs.
by Dmitry Timoshkov 13 Dec '17

13 Dec '17

The prototypes and type definions are a part of the Cryptographic Provider SDK. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/bcrypt/bcrypt.spec | 12 ++++++------ dlls/bcrypt/bcrypt_main.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/ncrypt/ncrypt.spec | 12 ++++++------ include/bcrypt.h | 23 +++++++++++++++++++++++ 4 files changed, 71 insertions(+), 12 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index 9ecd21d767..f00f55c306 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -1,5 +1,5 @@ -@ stub BCryptAddContextFunction -@ stub BCryptAddContextFunctionProvider +@ stdcall BCryptAddContextFunction(long wstr long wstr long) +@ stdcall BCryptAddContextFunctionProvider(long wstr long wstr wstr long) @ stdcall BCryptCloseAlgorithmProvider(ptr long) @ stub BCryptConfigureContext @ stub BCryptConfigureContextFunction @@ -39,9 +39,9 @@ @ stub BCryptQueryContextFunctionProperty @ stub BCryptQueryProviderRegistration @ stub BCryptRegisterConfigChangeNotify -@ stub BCryptRegisterProvider -@ stub BCryptRemoveContextFunction -@ stub BCryptRemoveContextFunctionProvider +@ stdcall BCryptRegisterProvider(wstr long ptr) +@ stdcall BCryptRemoveContextFunction(long wstr long wstr) +@ stdcall BCryptRemoveContextFunctionProvider(long wstr long wstr wstr) @ stub BCryptResolveProviders @ stub BCryptSecretAgreement @ stub BCryptSetAuditingInterface @@ -49,7 +49,7 @@ @ stdcall BCryptSetProperty(ptr wstr ptr long long) @ stub BCryptSignHash @ stub BCryptUnregisterConfigChangeNotify -@ stub BCryptUnregisterProvider +@ stdcall BCryptUnregisterProvider(wstr) @ stub BCryptVerifySignature @ stub GetAsymmetricEncryptionInterface @ stub GetCipherInterface diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 765f7589be..3bdc463904 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -122,6 +122,42 @@ static void gnutls_uninitialize(void) } #endif /* HAVE_GNUTLS_CIPHER_INIT && !HAVE_COMMONCRYPTO_COMMONCRYPTOR_H */ +NTSTATUS WINAPI BCryptAddContextFunction(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function, ULONG pos) +{ + FIXME("%08x, %s, %08x, %s, %u: stub\n", table, debugstr_w(context), iface, debugstr_w(function), pos); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptAddContextFunctionProvider(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function, LPCWSTR provider, ULONG pos) +{ + FIXME("%08x, %s, %08x, %s, %s, %u: stub\n", table, debugstr_w(context), iface, debugstr_w(function), debugstr_w(provider), pos); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptRemoveContextFunction(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function) +{ + FIXME("%08x, %s, %08x, %s: stub\n", table, debugstr_w(context), iface, debugstr_w(function)); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI BCryptRemoveContextFunctionProvider(ULONG table, LPCWSTR context, ULONG iface, LPCWSTR function, LPCWSTR provider) +{ + FIXME("%08x, %s, %08x, %s, %s: stub\n", table, debugstr_w(context), iface, debugstr_w(function), debugstr_w(provider)); + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS WINAPI BCryptRegisterProvider(LPCWSTR provider, ULONG flags, PCRYPT_PROVIDER_REG reg) +{ + FIXME("%s, %08x, %p: stub\n", debugstr_w(provider), flags, reg); + return STATUS_SUCCESS; +} + +NTSTATUS WINAPI BCryptUnregisterProvider(LPCWSTR provider) +{ + FIXME("%s: stub\n", debugstr_w(provider)); + return STATUS_NOT_IMPLEMENTED; +} + NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 1a78853bf4..5d371210d9 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -1,5 +1,5 @@ -@ stub BCryptAddContextFunction -@ stub BCryptAddContextFunctionProvider +@ stdcall BCryptAddContextFunction(long wstr long wstr long) bcrypt.BCryptAddContextFunction +@ stdcall BCryptAddContextFunctionProvider(long wstr long wstr wstr long) bcrypt.BCryptAddContextFunctionProvider @ stdcall BCryptCloseAlgorithmProvider(ptr long) bcrypt.BCryptCloseAlgorithmProvider @ stub BCryptConfigureContext @ stub BCryptConfigureContextFunction @@ -42,9 +42,9 @@ @ stub BCryptQueryContextFunctionProperty @ stub BCryptQueryProviderRegistration @ stub BCryptRegisterConfigChangeNotify -@ stub BCryptRegisterProvider -@ stub BCryptRemoveContextFunction -@ stub BCryptRemoveContextFunctionProvider +@ stdcall BCryptRegisterProvider(wstr long ptr) bcrypt.BCryptRegisterProvider +@ stdcall BCryptRemoveContextFunction(long wstr long wstr) bcrypt.BCryptRemoveContextFunction +@ stdcall BCryptRemoveContextFunctionProvider(long wstr long wstr wstr) bcrypt.BCryptRemoveContextFunctionProvider @ stub BCryptResolveProviders @ stub BCryptSecretAgreement @ stub BCryptSetAuditingInterface @@ -52,7 +52,7 @@ @ stdcall BCryptSetProperty(ptr wstr ptr long long) bcrypt.BCryptSetProperty @ stub BCryptSignHash @ stub BCryptUnregisterConfigChangeNotify -@ stub BCryptUnregisterProvider +@ stdcall BCryptUnregisterProvider(wstr) bcrypt.BCryptUnregisterProvider @ stub BCryptVerifySignature @ stub GetIsolationServerInterface @ stub GetKeyStorageInterface diff --git a/include/bcrypt.h b/include/bcrypt.h index 7c3c8d0744..1f7093c25a 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -94,6 +94,29 @@ typedef struct __BCRYPT_KEY_LENGTHS_STRUCT ULONG dwIncrement; } BCRYPT_KEY_LENGTHS_STRUCT; +typedef struct _CRYPT_INTERFACE_REG +{ + ULONG dwInterface; + ULONG dwFlags; + ULONG cFunctions; + PWSTR *rgpszFunctions; +} CRYPT_INTERFACE_REG, *PCRYPT_INTERFACE_REG; + +typedef struct _CRYPT_IMAGE_REG +{ + PWSTR pszImage; + ULONG cInterfaces; + PCRYPT_INTERFACE_REG *rgpInterfaces; +} CRYPT_IMAGE_REG, *PCRYPT_IMAGE_REG; + +typedef struct _CRYPT_PROVIDER_REG +{ + ULONG cAliases; + PWSTR *rgpszAliases; + PCRYPT_IMAGE_REG pUM; + PCRYPT_IMAGE_REG pKM; +} CRYPT_PROVIDER_REG, *PCRYPT_PROVIDER_REG; + typedef PVOID BCRYPT_ALG_HANDLE; typedef PVOID BCRYPT_KEY_HANDLE; typedef PVOID BCRYPT_HANDLE; -- 2.15.1

1 0

[PATCH 1/2] wine.inf: Add "Security Packages" key.
by Dmitry Timoshkov 13 Dec '17

13 Dec '17

These patches make the installer of a custom Cryptographic provider work in Wine. That key should also list msv1_0 (NTLM) and others but since Wine doesn't have those I didn't add them there. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d88e4ffa3f..a991319299 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -683,6 +683,7 @@ HKLM,Software\Microsoft\Windows Messaging Subsystem,"MAPI",2,"1" HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\hivelist,,16 +HKLM,System\CurrentControlSet\Control\Lsa,"Security Packages",0x10002,kerberos,schannel HKLM,System\CurrentControlSet\Control\Lsa\Kerberos,,16 HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2.0\Client,"DisabledByDefault",0x10003,1 HKLM,System\CurrentControlSet\Control\ServiceGroupOrder,"List",0x00010000,"TDI" -- 2.15.1

1 0

[PATCH] appwiz.cpl: Add comment explaining why we use HTTP instead of HTTPS
by Alex Henrie 13 Dec '17

13 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- This has come up at least twice on the mailing list because the reason is not obvious. A comment will help the next person who has the same question. https://www.winehq.org/pipermail/wine-devel/2017-February/116091.html https://www.winehq.org/pipermail/wine-devel/2017-November/120077.html --- dlls/appwiz.cpl/addons.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c index 5ec49cfe6a..76f00a0a3b 100644 --- a/dlls/appwiz.cpl/addons.c +++ b/dlls/appwiz.cpl/addons.c @@ -80,6 +80,9 @@ typedef struct { LPCWSTR dialog_template; } addon_info_t; +/* Download addon files over HTTP because Wine depends on an external library + * for TLS, so we can't be sure that HTTPS will work. The integrity of each file + * is checked with a hardcoded cryptographically secure hash. */ static const addon_info_t addons_info[] = { { GECKO_VERSION, -- 2.15.1

1 0

[PATCH] po: Update Norwegian translation
by Kim Malmo 13 Dec '17

13 Dec '17

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 79 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 39 insertions(+), 40 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 300ee868cf..81e8bb883c 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-19 16:00+0100\n" +"PO-Revision-Date: 2017-12-11 21:00+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -6962,7 +6962,7 @@ msgstr "Evaluerer startbetingelser" #: msi.rc:109 msgid "Migrating feature states from related applications" -msgstr "" +msgstr "Migrerer egenskapstilstand fra relaterte programmer" #: msi.rc:110 msgid "Moving files" @@ -6974,13 +6974,11 @@ msgstr "Publiserer assembly informasjon" #: msi.rc:112 msgid "Unpublishing assembly information" -msgstr "" +msgstr "Avpubliserer assembly informasjon" #: msi.rc:113 -#, fuzzy -#| msgid "Icon files" msgid "Patching files" -msgstr "Ikonfiler" +msgstr "Oppdaterer filer" #: msi.rc:114 msgid "Updating component registration" @@ -6992,7 +6990,7 @@ msgstr "Publiserer kvalifiserte komponenter" #: msi.rc:116 msgid "Publishing Product Features" -msgstr "" +msgstr "Publiserer produktegenskaper" #: msi.rc:117 msgid "Publishing product information" @@ -7008,7 +7006,7 @@ msgstr "Registrerer COM+ programmer og komponenter" #: msi.rc:120 msgid "Registering extension servers" -msgstr "" +msgstr "Registrerer utvidelsestjenere" #: msi.rc:121 msgid "Registering fonts" @@ -7024,7 +7022,7 @@ msgstr "Registrerer produkt" #: msi.rc:124 msgid "Registering program identifiers" -msgstr "" +msgstr "Registrerer programidentifikatorer" #: msi.rc:125 msgid "Registering type libraries" @@ -7039,10 +7037,8 @@ msgid "Removing duplicated files" msgstr "Fjerner duplikate filer" #: msi.rc:128 msi.rc:152 -#, fuzzy -#| msgid "Applying font settings" msgid "Updating environment strings" -msgstr "Aktiverer skriftinnstillinger" +msgstr "Oppdaterer miljøvariabler" #: msi.rc:129 msgid "Removing applications" @@ -7058,7 +7054,7 @@ msgstr "Fjerner mapper" #: msi.rc:132 msgid "Removing INI files entries" -msgstr "" +msgstr "Fjerner INI filoppføringer" #: msi.rc:133 msgid "Removing ODBC components" @@ -7098,7 +7094,7 @@ msgstr "Avpubliserer kvalifiserte komponenter" #: msi.rc:143 msgid "Unpublishing Product Features" -msgstr "" +msgstr "Avpubliserer produktegenskaper" #: msi.rc:144 msgid "Unpublishing product information" @@ -7114,7 +7110,7 @@ msgstr "Avregistrerer COM+ programmer og komponenter" #: msi.rc:147 msgid "Unregistering extension servers" -msgstr "" +msgstr "Avregistrerer utvidelsestjenere" #: msi.rc:148 msgid "Unregistering fonts" @@ -7126,7 +7122,7 @@ msgstr "Avregistrerer MIME informasjon" #: msi.rc:150 msgid "Unregistering program identifiers" -msgstr "" +msgstr "Avregistrerer programidentifikatorer" #: msi.rc:151 msgid "Unregistering type libraries" @@ -7134,7 +7130,7 @@ msgstr "Avregistrerer typebibliotek" #: msi.rc:153 msgid "Writing INI files values" -msgstr "" +msgstr "Skriver INI filverdier" #: msi.rc:154 msgid "Writing system registry values" @@ -7146,7 +7142,7 @@ msgstr "Plass ledig: [1]" #: msi.rc:161 msgid "Property: [1], Signature: [2]" -msgstr "" +msgstr "Egenskap: [1], Signatur: [2]" #: msi.rc:162 msgid "File: [1]" @@ -7190,7 +7186,7 @@ msgstr "Program: [1]" #: msi.rc:174 msi.rc:175 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "" +msgstr "Programkontekst:[1], Assemblynavn:[2]" #: msi.rc:176 msgid "File: [1], Directory: [2], Size: [3]" @@ -7198,19 +7194,19 @@ msgstr "Fil: [1], Mappe: [2], Størrelse: [6]" #: msi.rc:177 msi.rc:198 msgid "Component ID: [1], Qualifier: [2]" -msgstr "" +msgstr "Komponent ID: [1], Kvalifiserer: [2]" #: msi.rc:178 msi.rc:199 msgid "Feature: [1]" -msgstr "" +msgstr "Egenskap: [1]" #: msi.rc:179 msi.rc:200 msgid "Class Id: [1]" -msgstr "" +msgstr "Klasse ID: [1]" #: msi.rc:180 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2], Brukere: [3], RSN: [4]}" #: msi.rc:181 msi.rc:202 msgid "Extension: [1]" @@ -7222,7 +7218,7 @@ msgstr "Skrift: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "" +msgstr "MIME innholdstype: [1], Utvidelse: [2]" #: msi.rc:184 msi.rc:205 msgid "ProgId: [1]" @@ -7234,27 +7230,27 @@ msgstr "" #: msi.rc:186 msi.rc:189 msgid "File: [1], Directory: [9]" -msgstr "" +msgstr "Fil: [1], Mappe: [2]" #: msi.rc:187 msi.rc:207 msgid "Name: [1], Value: [2], Action [3]" -msgstr "" +msgstr "Navn: [1], Verdi: [2], Handling [3]" #: msi.rc:188 msgid "Application: [1], Command line: [2]" -msgstr "" +msgstr "Program: [1], Kommandolinje: [2]" #: msi.rc:191 msi.rc:208 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "" +msgstr "Fil: [1], Seksjon: [2], Nøkkel: [3], Verdi: [4]" #: msi.rc:192 msgid "Key: [1], Name: [2]" -msgstr "" +msgstr "Nøkkel: [1], Navn: [2]" #: msi.rc:194 msi.rc:195 msgid "File: [1], Folder: [2]" -msgstr "" +msgstr "Fil: [1], Mappe: [2]" #: msi.rc:201 msgid "AppId: [1]{{, AppType: [2]}}" @@ -7262,7 +7258,7 @@ msgstr "" #: msi.rc:209 msgid "Key: [1], Name: [2], Value: [3]" -msgstr "" +msgstr "Nøkkel: [1], Navn: [2], Verdi: [3]" #: msi.rc:71 msgid "{{Fatal error: }}" @@ -7286,6 +7282,9 @@ msgid "" "This may indicate a problem with this package. The error code is [1]. {{The " "arguments are: [2], [3], [4]}}" msgstr "" +"Installeren har truffet på ett eventet problem under installeringen av denne " +"pakken. Dette kan skyldes ett problem med denne pakken. Errorkoden er [1]. {{" +"Argumentene er: [2], [3], [4]}}" #: msi.rc:76 msgid "{{Disk full: }}" @@ -7293,33 +7292,35 @@ msgstr "{{Disken er full: }}" #: msi.rc:77 msgid "Action [Time]: [1]. [2]" -msgstr "" +msgstr "Handling [Tid]: [1]. [2]" #: msi.rc:78 msgid "Message type: [1], Argument: [2]{, [3]}" -msgstr "" +msgstr "Meldingstype: [1], Argument: [2]{, [3]" #: msi.rc:81 msgid "=== Logging started: [Date] [Time] ===" -msgstr "" +msgstr "=== Logging startet: [Dato] [Tid] ===" #: msi.rc:79 msgid "Action start [Time]: [1]." -msgstr "" +msgstr "Handling startet [Tid]: [1]." #: msi.rc:80 msgid "Action ended [Time]: [1]. Return value [2]." -msgstr "" +msgstr "Handling avsluttet [Tid]: [1]. Returnert verdi [2]." #: msi.rc:83 msgid "Please insert the disk: [2]" -msgstr "" +msgstr "Vennligst sett inn disk: [2]" #: msi.rc:84 msgid "" "Source file not found{{(cabinet)}}: [2]. Verify that the file exists and " "that you can access it." msgstr "" +"Kildefil ikke funnet{{(cabinet)}}: [2]. Bekreft at den finnes og at du har " +"tilgang til den." #: msrle32.rc:31 msgid "Wine MS-RLE video codec" @@ -8923,10 +8924,8 @@ msgid " sec" msgstr " sek" #: twain.rc:29 -#, fuzzy -#| msgid "Select Folder" msgid "Select Source" -msgstr "Velg mappe" +msgstr "Velg kilde" #: urlmon.rc:32 wininet.rc:77 msgid "Security Warning" -- 2.14.1

1 0

[PATCH 3/3] [v2 resend] tzres: Add resource-only DLL for time zone names and use it.
by Akihiro Sagawa 12 Dec '17

12 Dec '17

In version 2, add test code updates. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- configure | 2 + configure.ac | 1 + dlls/ntdll/tests/time.c | 8 +- dlls/tzres/Makefile.in | 2 + dlls/tzres/tzres.rc | 245 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/tzres/tzres.spec | 1 + loader/wine.inf.in | 208 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 463 insertions(+), 4 deletions(-) create mode 100644 dlls/tzres/Makefile.in create mode 100644 dlls/tzres/tzres.rc create mode 100644 dlls/tzres/tzres.spec

1 0

[PATCH 2/3] [resned] ntdll, kernel32: Use MUI strings when getting time zone names.
by Akihiro Sagawa 12 Dec '17

12 Dec '17

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/kernel_private.h | 2 + dlls/kernel32/resource.c | 96 ++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/time.c | 47 +++++++++++++++++++-- dlls/ntdll/time.c | 8 +++- 4 files changed, 148 insertions(+), 5 deletions(-)

1 0

[PATCH 1/3] ntdll/tests: Add tests for time zone names.
by Akihiro Sagawa 12 Dec '17

12 Dec '17

Test shows internal NT API returns an indirect string, e.g. @tzres.dll,-32, not a localized one in Vista or later. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/tests/time.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)

1 0

[PATCH] po: Update Japanese Translation.
by Akihiro Sagawa 12 Dec '17

12 Dec '17

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 91 +++++++++++----------------------------------------------------- 1 file changed, 15 insertions(+), 76 deletions(-)

1 0

[PATCH 2/2] mshtml/tests: Added a test of calls to functions from different frame.
by Jacek Caban 12 Dec '17

12 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/elements.js | 16 ++++++++++++++++ dlls/mshtml/tests/frame.js | 25 +++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 6 ++++++ dlls/mshtml/tests/runscript.html | 11 +++++++++++ 4 files changed, 58 insertions(+) create mode 100644 dlls/mshtml/tests/frame.js create mode 100644 dlls/mshtml/tests/runscript.html

1 0

[PATCH 1/2] jscript: Do not pass DISPATCH_JSCRIPT_CALLEREXECSSOURCE flag for calls across different script contexts.
by Jacek Caban 12 Dec '17

12 Dec '17

Fixes regression in calls between different contexts. Spotted by Nikolay. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/dispex.c | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[PATCH] explorer: Take spaces into account when returning string length
by Alistair Leslie-Hughes 11 Dec '17

11 Dec '17

Fixes: https://bugs.winehq.org/show_bug.cgi?id=44153 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- programs/explorer/explorer.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index afb565f..59dc84d 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -660,9 +660,13 @@ static IShellFolder* get_starting_shell_folder(parameters_struct* params) static int copy_path_string(LPWSTR target, LPWSTR source) { - INT i = 0; + INT i = 0, spaces = 0; - while (isspaceW(*source)) source++; + while (isspaceW(*source)) + { + source++; + spaces++; + } if (*source == '\"') { @@ -678,7 +682,7 @@ static int copy_path_string(LPWSTR target, LPWSTR source) target[i] = 0; } PathRemoveBackslashW(target); - return i; + return i+ spaces; } -- 1.9.1

1 0

[PATCH] kernel32: add QueryProcessCycleTime stub (try 2)
by Austin English 11 Dec '17

11 Dec '17

Try 2: remove accidental double pointer (Thanks Nikolay) Signed-off-by: Austin English <austinenglish(a)gmail.com> --- .../api-ms-win-core-realtime-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/time.c | 12 ++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec b/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec index 9c70db1f6f..0def2d7b3a 100644 --- a/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec +++ b/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec @@ -1,5 +1,5 @@ @ stub QueryIdleProcessorCycleTime @ stub QueryIdleProcessorCycleTimeEx -@ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime @ stdcall QueryThreadCycleTime(long ptr) kernel32.QueryThreadCycleTime @ stdcall QueryUnbiasedInterruptTime(ptr) kernel32.QueryUnbiasedInterruptTime diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2c719d437e..5ce637233a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1171,7 +1171,7 @@ @ stdcall QueryPerformanceCounter(ptr) @ stdcall QueryPerformanceFrequency(ptr) # @ stub QueryProcessAffinityUpdateMode -# @ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) @ stdcall QueryThreadCycleTime(long ptr) # @ stub QueryThreadProfiling # @ stub QueryThreadpoolStackInformation diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index fbe58118fd..b0b866967c 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1408,6 +1408,18 @@ DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo } /*********************************************************************** + * QueryProcessCycleTime (KERNEL32.@) + */ +BOOL WINAPI QueryProcessCycleTime(HANDLE process, PULONG64 cycle) +{ + static int once; + if (!once++) + FIXME("(%p,%p): stub!\n", process, cycle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * QueryThreadCycleTime (KERNEL32.@) */ BOOL WINAPI QueryThreadCycleTime(HANDLE thread, PULONG64 cycle) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index b9eb4fcf87..ca33bfdce7 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1206,7 +1206,7 @@ @ stdcall QueryPerformanceCounter(ptr) kernel32.QueryPerformanceCounter @ stdcall QueryPerformanceFrequency(ptr) kernel32.QueryPerformanceFrequency @ stub QueryProcessAffinityUpdateMode -# @ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime # @ stub QueryProtectedPolicy @ stub QuerySecurityAccessMask # @ stub QueryStateAtomValueInfo -- 2.13.6

1 0

[PATCH] kernel32: add QueryProcessCycleTime stub
by Austin English 11 Dec '17

11 Dec '17

Fixes a crash in a private application, reported in #winehq. Signed-off-by: Austin English <austinenglish(a)gmail.com> --- .../api-ms-win-core-realtime-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/time.c | 12 ++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec b/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec index 9c70db1f6f..0def2d7b3a 100644 --- a/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec +++ b/dlls/api-ms-win-core-realtime-l1-1-0/api-ms-win-core-realtime-l1-1-0.spec @@ -1,5 +1,5 @@ @ stub QueryIdleProcessorCycleTime @ stub QueryIdleProcessorCycleTimeEx -@ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime @ stdcall QueryThreadCycleTime(long ptr) kernel32.QueryThreadCycleTime @ stdcall QueryUnbiasedInterruptTime(ptr) kernel32.QueryUnbiasedInterruptTime diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 2c719d437e..5ce637233a 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1171,7 +1171,7 @@ @ stdcall QueryPerformanceCounter(ptr) @ stdcall QueryPerformanceFrequency(ptr) # @ stub QueryProcessAffinityUpdateMode -# @ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) @ stdcall QueryThreadCycleTime(long ptr) # @ stub QueryThreadProfiling # @ stub QueryThreadpoolStackInformation diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index fbe58118fd..c163969c59 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -1408,6 +1408,18 @@ DWORD WINAPI GetDynamicTimeZoneInformation(DYNAMIC_TIME_ZONE_INFORMATION *tzinfo } /*********************************************************************** + * QueryProcessCycleTime (KERNEL32.@) + */ +BOOL WINAPI QueryProcessCycleTime(HANDLE process, PULONG64 *cycle) +{ + static int once; + if (!once++) + FIXME("(%p,%p): stub!\n", process, cycle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} + +/*********************************************************************** * QueryThreadCycleTime (KERNEL32.@) */ BOOL WINAPI QueryThreadCycleTime(HANDLE thread, PULONG64 cycle) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index b9eb4fcf87..ca33bfdce7 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1206,7 +1206,7 @@ @ stdcall QueryPerformanceCounter(ptr) kernel32.QueryPerformanceCounter @ stdcall QueryPerformanceFrequency(ptr) kernel32.QueryPerformanceFrequency @ stub QueryProcessAffinityUpdateMode -# @ stub QueryProcessCycleTime +@ stdcall QueryProcessCycleTime(long ptr) kernel32.QueryProcessCycleTime # @ stub QueryProtectedPolicy @ stub QuerySecurityAccessMask # @ stub QueryStateAtomValueInfo -- 2.13.6

1 0

[PATCH] po: Update Norwegian translation
by Kim Malmo 11 Dec '17

11 Dec '17

Signed-off-by: Kim Malmo <berencamlost(a)msn.com> --- po/nb_NO.po | 54 +++++++++++++++++++++++++----------------------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 300ee868cf..663472c2c6 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-07-19 16:00+0100\n" +"PO-Revision-Date: 2017-12-11 21:00+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -6962,7 +6962,7 @@ msgstr "Evaluerer startbetingelser" #: msi.rc:109 msgid "Migrating feature states from related applications" -msgstr "" +msgstr "Migrerer egenskapstilstand fra relaterte programmer" #: msi.rc:110 msgid "Moving files" @@ -6974,13 +6974,11 @@ msgstr "Publiserer assembly informasjon" #: msi.rc:112 msgid "Unpublishing assembly information" -msgstr "" +msgstr "Avpubliserer assembly informasjon" #: msi.rc:113 -#, fuzzy -#| msgid "Icon files" msgid "Patching files" -msgstr "Ikonfiler" +msgstr "Oppdaterer filer" #: msi.rc:114 msgid "Updating component registration" @@ -6992,7 +6990,7 @@ msgstr "Publiserer kvalifiserte komponenter" #: msi.rc:116 msgid "Publishing Product Features" -msgstr "" +msgstr "Publiserer produktegenskaper" #: msi.rc:117 msgid "Publishing product information" @@ -7008,7 +7006,7 @@ msgstr "Registrerer COM+ programmer og komponenter" #: msi.rc:120 msgid "Registering extension servers" -msgstr "" +msgstr "Registrerer utvidelsestjenere" #: msi.rc:121 msgid "Registering fonts" @@ -7024,7 +7022,7 @@ msgstr "Registrerer produkt" #: msi.rc:124 msgid "Registering program identifiers" -msgstr "" +msgstr "Registrerer programidentifikatorer" #: msi.rc:125 msgid "Registering type libraries" @@ -7039,10 +7037,8 @@ msgid "Removing duplicated files" msgstr "Fjerner duplikate filer" #: msi.rc:128 msi.rc:152 -#, fuzzy -#| msgid "Applying font settings" msgid "Updating environment strings" -msgstr "Aktiverer skriftinnstillinger" +msgstr "Oppdaterer miljøvariabler" #: msi.rc:129 msgid "Removing applications" @@ -7058,7 +7054,7 @@ msgstr "Fjerner mapper" #: msi.rc:132 msgid "Removing INI files entries" -msgstr "" +msgstr "Fjerner INI filoppføringer" #: msi.rc:133 msgid "Removing ODBC components" @@ -7098,7 +7094,7 @@ msgstr "Avpubliserer kvalifiserte komponenter" #: msi.rc:143 msgid "Unpublishing Product Features" -msgstr "" +msgstr "Avpubliserer produktegenskaper" #: msi.rc:144 msgid "Unpublishing product information" @@ -7114,7 +7110,7 @@ msgstr "Avregistrerer COM+ programmer og komponenter" #: msi.rc:147 msgid "Unregistering extension servers" -msgstr "" +msgstr "Avregistrerer utvidelsestjenere" #: msi.rc:148 msgid "Unregistering fonts" @@ -7126,7 +7122,7 @@ msgstr "Avregistrerer MIME informasjon" #: msi.rc:150 msgid "Unregistering program identifiers" -msgstr "" +msgstr "Avregistrerer programidentifikatorer" #: msi.rc:151 msgid "Unregistering type libraries" @@ -7134,7 +7130,7 @@ msgstr "Avregistrerer typebibliotek" #: msi.rc:153 msgid "Writing INI files values" -msgstr "" +msgstr "Skriver INI filverdier" #: msi.rc:154 msgid "Writing system registry values" @@ -7146,7 +7142,7 @@ msgstr "Plass ledig: [1]" #: msi.rc:161 msgid "Property: [1], Signature: [2]" -msgstr "" +msgstr "Egenskap: [1], Signatur: [2]" #: msi.rc:162 msgid "File: [1]" @@ -7190,7 +7186,7 @@ msgstr "Program: [1]" #: msi.rc:174 msi.rc:175 msgid "Application Context:[1], Assembly Name:[2]" -msgstr "" +msgstr "Programkontekst:[1], Assemblynavn:[2]" #: msi.rc:176 msgid "File: [1], Directory: [2], Size: [3]" @@ -7198,19 +7194,19 @@ msgstr "Fil: [1], Mappe: [2], Størrelse: [6]" #: msi.rc:177 msi.rc:198 msgid "Component ID: [1], Qualifier: [2]" -msgstr "" +msgstr "Komponent ID: [1], Kvalifiserer: [2]" #: msi.rc:178 msi.rc:199 msgid "Feature: [1]" -msgstr "" +msgstr "Egenskap: [1]" #: msi.rc:179 msi.rc:200 msgid "Class Id: [1]" -msgstr "" +msgstr "Klasse ID: [1]" #: msi.rc:180 msgid "AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}" -msgstr "" +msgstr "AppId: [1]{{, AppType: [2], Brukere: [3], RSN: [4]}" #: msi.rc:181 msi.rc:202 msgid "Extension: [1]" @@ -7222,7 +7218,7 @@ msgstr "Skrift: [1]" #: msi.rc:183 msi.rc:204 msgid "MIME Content Type: [1], Extension: [2]" -msgstr "" +msgstr "MIME innholdstype: [1], Utvidelse: [2]" #: msi.rc:184 msi.rc:205 msgid "ProgId: [1]" @@ -7234,23 +7230,23 @@ msgstr "" #: msi.rc:186 msi.rc:189 msgid "File: [1], Directory: [9]" -msgstr "" +msgstr "Fil: [1], Mappe: [2]" #: msi.rc:187 msi.rc:207 msgid "Name: [1], Value: [2], Action [3]" -msgstr "" +msgstr "Navn: [1], Verdi: [2], Handling [3]" #: msi.rc:188 msgid "Application: [1], Command line: [2]" -msgstr "" +msgstr "Program: [1], Kommandolinje: [2]" #: msi.rc:191 msi.rc:208 msgid "File: [1], Section: [2], Key: [3], Value: [4]" -msgstr "" +msgstr "Fil: [1], Seksjon: [2], Nøkkel: [3], Verdi: [4]" #: msi.rc:192 msgid "Key: [1], Name: [2]" -msgstr "" +msgstr "Nøkkel: [1], Navn: [2]" #: msi.rc:194 msi.rc:195 msgid "File: [1], Folder: [2]" -- 2.14.1

1 0

Android packages
by Alexandre Julliard 11 Dec '17

11 Dec '17

Folks, Experimental Android packages are now available at: https://dl.winehq.org/wine-builds/android/wine-3.0-rc1-x86.apk https://dl.winehq.org/wine-builds/android/wine-3.0-rc1-arm.apk for Intel and ARM devices respectively, running Android 4.3 or above. Please give them a try and let me know how it goes. -- Alexandre Julliard julliard(a)winehq.org

1 0

[PATCH] ole32: Fix regression in OLE's data cache test.
by Sergio Gómez Del Real 11 Dec '17

11 Dec '17

Regression is reported at https://bugs.winehq.org/show_bug.cgi?id=44147 Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/ole32/datacache.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 75c961164e..ae05b8e176 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -792,8 +792,14 @@ static void init_stream_header(DataCacheEntry *entry, PresentationDataHeader *he static HRESULT save_dib(DataCacheEntry *entry, BOOL contents, IStream *stream) { HRESULT hr = S_OK; - int data_size = GlobalSize(entry->stgmedium.u.hGlobal); - BITMAPINFO *bmi = GlobalLock(entry->stgmedium.u.hGlobal); + int data_size = 0; + BITMAPINFO *bmi = NULL; + + if (entry->stgmedium.tymed != TYMED_NULL) + { + data_size = GlobalSize(entry->stgmedium.u.hGlobal); + bmi = GlobalLock(entry->stgmedium.u.hGlobal); + } if (!contents) { -- 2.14.1

1 0

[PATCH 1/7] wined3d: Fix device format support checks for multiple usages.
by Józef Kucia 11 Dec '17

11 Dec '17

We can return WINED3DOK_NOAUTOGEN only when all other resource usages are supported. Fixes 25a8773d21d0 ("wined3d: Advertise AUTOGENMIPMAP only for renderable and filterable formats."). The problem was present before 25a8773d21d0, but the mentioned commit made it much worse. Previously, it was an issue only for OpenGL implementations which do not support the GL_SGIS_generate_mipmap extension. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/directx.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c145944e11b9..1586bdc82147 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5273,10 +5273,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad { const struct wined3d_adapter *adapter = &wined3d->adapters[adapter_idx]; const struct wined3d_gl_info *gl_info = &adapter->gl_info; - const struct wined3d_format *adapter_format = wined3d_get_format(gl_info, adapter_format_id, - WINED3DUSAGE_RENDERTARGET); - const struct wined3d_format *format = wined3d_get_format(gl_info, check_format_id, usage); + const struct wined3d_format *adapter_format, *format; enum wined3d_gl_resource_type gl_type, gl_type_end; + BOOL mipmap_autogen_supported; DWORD format_flags = 0; DWORD allowed_usage; @@ -5289,6 +5288,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; + adapter_format = wined3d_get_format(gl_info, adapter_format_id, WINED3DUSAGE_RENDERTARGET); + format = wined3d_get_format(gl_info, check_format_id, usage); + switch (resource_type) { case WINED3D_RTYPE_NONE: @@ -5387,14 +5389,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad return WINED3DERR_NOTAVAILABLE; } - if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && (!gl_info->supported[SGIS_GENERATE_MIPMAP] - || (format->flags[gl_type] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)) - != (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING))) - { - TRACE("No WINED3DUSAGE_AUTOGENMIPMAP support, returning WINED3DOK_NOAUTOGEN.\n"); - return WINED3DOK_NOAUTOGEN; - } - + mipmap_autogen_supported = gl_info->supported[SGIS_GENERATE_MIPMAP]; for (; gl_type <= gl_type_end; ++gl_type) { if ((format->flags[gl_type] & format_flags) != format_flags) @@ -5423,6 +5418,18 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad debug_d3dformat(check_format_id)); return WINED3DERR_NOTAVAILABLE; } + + if ((format->flags[gl_type] & (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)) + != (WINED3DFMT_FLAG_RENDERTARGET | WINED3DFMT_FLAG_FILTERING)) + { + mipmap_autogen_supported = FALSE; + } + } + + if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && !mipmap_autogen_supported) + { + TRACE("No WINED3DUSAGE_AUTOGENMIPMAP support, returning WINED3DOK_NOAUTOGEN.\n"); + return WINED3DOK_NOAUTOGEN; } return WINED3D_OK; -- 2.13.6

4 15

[PATCH] xaudio2: Account for abandoned buffer bytes
by Andrew Eikum 11 Dec '17

11 Dec '17

This should fix Bug 44148, a regression caused by e2c73fc394ba. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xaudio2_7/xaudio_dll.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 8f15ded023..bc5cf1cae9 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2286,13 +2286,14 @@ static void update_source_state(XA2SourceImpl *src) src->first_al_buf %= XAUDIO2_MAX_QUEUED_BUFFERS; src->al_bufs_used -= processed; - if(processed > src->abandoned_albufs){ - for(i = src->abandoned_albufs; i < processed; ++i){ - ALint bufsize; + for(i = 0; i < processed; ++i){ + ALint bufsize; - alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); + alGetBufferi(al_buffers[i], AL_SIZE, &bufsize); - src->in_al_bytes -= bufsize; + src->in_al_bytes -= bufsize; + + if(src->abandoned_albufs == 0){ src->played_frames += bufsize / src->submit_blocksize; if(al_buffers[i] == src->buffers[src->first_buf].latest_al_buf){ @@ -2318,11 +2319,10 @@ static void update_source_state(XA2SourceImpl *src) src->buffers[src->first_buf].xa2buffer.pContext); } } + }else{ + src->abandoned_albufs--; } - - src->abandoned_albufs = 0; - }else - src->abandoned_albufs -= processed; + } } if(!src->running) -- 2.15.1

1 0

[PATCH] mshtml/tests: Skip documentMode tests on IE7.
by Jacek Caban 11 Dec '17

11 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[PATCH v2 1/5] d3d11/tests: Add a couple of testcases for UINT, sRGB UAVs.
by Matteo Bruni 11 Dec '17

11 Dec '17

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Undefine the new abbreviations. dlls/d3d11/tests/d3d11.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 8c9f66f27a..afcd4ae783 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -14103,6 +14103,8 @@ static void test_create_unordered_access_view(void) #define FMT_UNKNOWN DXGI_FORMAT_UNKNOWN #define RGBA8_UNORM DXGI_FORMAT_R8G8B8A8_UNORM +#define RGBA8_SRGB DXGI_FORMAT_R8G8B8A8_UNORM_SRGB +#define RGBA8_UINT DXGI_FORMAT_R8G8B8A8_UINT #define RGBA8_TL DXGI_FORMAT_R8G8B8A8_TYPELESS #define DIM_UNKNOWN D3D11_UAV_DIMENSION_UNKNOWN #define TEX_1D D3D11_UAV_DIMENSION_TEXTURE1D @@ -14130,6 +14132,8 @@ static void test_create_unordered_access_view(void) {{10, 1, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_2D, 9}, {RGBA8_UNORM, TEX_2D, 9}}, {{ 1, 1, RGBA8_TL}, {RGBA8_UNORM, TEX_2D, 0}, {RGBA8_UNORM, TEX_2D, 0}}, {{10, 1, RGBA8_TL}, {RGBA8_UNORM, TEX_2D, 0}, {RGBA8_UNORM, TEX_2D, 0}}, + {{ 1, 1, RGBA8_UINT}, {0}, {RGBA8_UINT, TEX_2D, 0, 0, 1}}, + {{ 1, 1, RGBA8_TL}, {RGBA8_UINT, TEX_2D, 0, 0, ~0u}, {RGBA8_UINT, TEX_2D, 0, 0, 1}}, {{ 1, 4, RGBA8_UNORM}, {0}, {RGBA8_UNORM, TEX_2D_ARRAY, 0, 0, 4}}, {{10, 4, RGBA8_UNORM}, {0}, {RGBA8_UNORM, TEX_2D_ARRAY, 0, 0, 4}}, {{10, 4, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_2D_ARRAY, 0, 0, ~0u}, {RGBA8_UNORM, TEX_2D_ARRAY, 0, 0, 4}}, @@ -14184,6 +14188,10 @@ static void test_create_unordered_access_view(void) {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_2D_ARRAY, 1, 0, 1}}, {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_2D_ARRAY, 0, 0, 2}}, {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_2D_ARRAY, 0, 1, 1}}, + {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_UINT, TEX_2D, 0, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_UINT}, {RGBA8_UNORM, TEX_2D, 0, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_UNORM}, {RGBA8_SRGB, TEX_2D, 0, 0, 1}}, + {{TEX_2D, 1, 1, RGBA8_SRGB}, {RGBA8_UNORM, TEX_2D, 0, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D, 0}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_1D_ARRAY, 0, 0, 1}}, {{TEX_3D, 1, 1, RGBA8_UNORM}, {RGBA8_UNORM, TEX_2D, 0}}, @@ -14207,6 +14215,8 @@ static void test_create_unordered_access_view(void) }; #undef FMT_UNKNOWN #undef RGBA8_UNORM +#undef RGBA8_SRGB +#undef RGBA8_UINT #undef RGBA8_TL #undef DIM_UNKNOWN #undef TEX_1D -- 2.13.6

3 7

[PATCH] comctl32/listview: Directly reset focused item on item count change
by Nikolay Sivov 11 Dec '17

11 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=43915 There's more problems with LVS_OWNERDATA lists, tests already cover some, callback mask for example is not relevant for this bug. dlls/comctl32/listview.c | 1 + dlls/comctl32/tests/listview.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 4cb1f0d53a..4d700b9cec 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8834,6 +8834,7 @@ static BOOL LISTVIEW_SetItemCount(LISTVIEW_INFO *infoPtr, INT nItems, DWORD dwFl if (infoPtr->nFocusedItem >= nItems) { LISTVIEW_SetItemFocus(infoPtr, -1); + infoPtr->nFocusedItem = -1; SetRectEmpty(&infoPtr->rcFocus); } } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 4e2efe422b..f291698e76 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6107,10 +6107,9 @@ todo_wine ok(ret, "Failed to set item count.\n"); ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); -todo_wine ok(ret == -1, "Unexpected focused item, ret %d\n", ret); - ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent seq, owner data/focus 2", TRUE); + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent seq, owner data/focus 2", FALSE); /* 2 items, focus on index 0, reduce to 1 item. */ flush_sequences(sequences, NUM_MSG_SEQUENCES); -- 2.15.1

1 0

[PATCH] wshom: Implement Popup() method
by Nikolay Sivov 11 Dec '17

11 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Useful for https://bugs.winehq.org/show_bug.cgi?id=44139. dlls/wshom.ocx/shell.c | 78 +++++++++++++++++++++++++++++++++++++++++--- dlls/wshom.ocx/tests/wshom.c | 49 ++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+), 4 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index b00bc1060e..a023786cc1 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1275,11 +1275,81 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, } } -static HRESULT WINAPI WshShell3_Popup(IWshShell3 *iface, BSTR Text, VARIANT* SecondsToWait, VARIANT *Title, VARIANT *Type, int *button) +struct popup_thread_param { - FIXME("(%s %s %s %s %p): stub\n", debugstr_w(Text), debugstr_variant(SecondsToWait), - debugstr_variant(Title), debugstr_variant(Type), button); - return E_NOTIMPL; + WCHAR *text; + VARIANT title; + VARIANT type; + INT button; +}; + +static DWORD WINAPI popup_thread_proc(void *arg) +{ + static const WCHAR defaulttitleW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0}; + struct popup_thread_param *param = (struct popup_thread_param *)arg; + + param->button = MessageBoxW(NULL, param->text, is_optional_argument(&param->title) ? + defaulttitleW : V_BSTR(&param->title), V_I4(&param->type)); + return 0; +} + +static HRESULT WINAPI WshShell3_Popup(IWshShell3 *iface, BSTR text, VARIANT *seconds_to_wait, VARIANT *title, + VARIANT *type, int *button) +{ + struct popup_thread_param param; + DWORD tid, status; + VARIANT timeout; + HANDLE hthread; + HRESULT hr; + + TRACE("(%s %s %s %s %p)\n", debugstr_w(text), debugstr_variant(seconds_to_wait), debugstr_variant(title), + debugstr_variant(type), button); + + if (!seconds_to_wait || !title || !type || !button) + return E_POINTER; + + VariantInit(&timeout); + if (!is_optional_argument(seconds_to_wait)) + { + hr = VariantChangeType(&timeout, seconds_to_wait, 0, VT_I4); + if (FAILED(hr)) + return hr; + } + + VariantInit(&param.type); + if (!is_optional_argument(type)) + { + hr = VariantChangeType(&param.type, type, 0, VT_I4); + if (FAILED(hr)) + return hr; + } + + if (is_optional_argument(title)) + param.title = *title; + else + { + VariantInit(&param.title); + hr = VariantChangeType(&param.title, title, 0, VT_BSTR); + if (FAILED(hr)) + return hr; + } + + param.text = text; + param.button = -1; + hthread = CreateThread(NULL, 0, popup_thread_proc, &param, 0, &tid); + status = MsgWaitForMultipleObjects(1, &hthread, FALSE, V_I4(&timeout) ? V_I4(&timeout) * 1000: INFINITE, 0); + if (status == WAIT_TIMEOUT) + { + PostThreadMessageW(tid, WM_QUIT, 0, 0); + MsgWaitForMultipleObjects(1, &hthread, FALSE, INFINITE, 0); + param.button = -1; + } + *button = param.button; + + VariantClear(&param.title); + CloseHandle(hthread); + + return S_OK; } static HRESULT WINAPI WshShell3_CreateShortcut(IWshShell3 *iface, BSTR PathLink, IDispatch** Shortcut) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 7e82f30c18..18ff4d6228 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -566,6 +566,54 @@ static void test_registry(void) IWshShell3_Release(sh3); } +static void test_popup(void) +{ + static const WCHAR textW[] = {'T','e','x','t',0}; + VARIANT timeout, type, title, optional; + IWshShell *sh; + int button; + HRESULT hr; + BSTR text; + + hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IWshShell, (void **)&sh); + ok(hr == S_OK, "Failed to create WshShell object, hr %#x.\n", hr); + + button = 123; + text = SysAllocString(textW); + + hr = IWshShell_Popup(sh, NULL, NULL, NULL, NULL, &button); + ok(hr == E_POINTER, "Unexpected retval %#x.\n", hr); + ok(button == 123, "Unexpected button id %d.\n", button); + + hr = IWshShell_Popup(sh, text, NULL, NULL, NULL, &button); + ok(hr == E_POINTER, "Unexpected retval %#x.\n", hr); + ok(button == 123, "Unexpected button id %d.\n", button); + + V_VT(&optional) = VT_ERROR; + V_ERROR(&optional) = DISP_E_PARAMNOTFOUND; + + V_VT(&timeout) = VT_I2; + V_I2(&timeout) = 1; + + V_VT(&type) = VT_I2; + V_I2(&type) = 1; + + V_VT(&title) = VT_BSTR; + V_BSTR(&title) = NULL; + + hr = IWshShell_Popup(sh, text, &timeout, &optional, &type, &button); + ok(hr == S_OK, "Unexpected retval %#x.\n", hr); + ok(button == -1, "Unexpected button id %d.\n", button); + + hr = IWshShell_Popup(sh, text, &timeout, &title, &optional, &button); + ok(hr == S_OK, "Unexpected retval %#x.\n", hr); + ok(button == -1, "Unexpected button id %d.\n", button); + + SysFreeString(text); + IWshShell_Release(sh); +} + START_TEST(wshom) { IUnknown *unk; @@ -583,6 +631,7 @@ START_TEST(wshom) test_wshshell(); test_registry(); + test_popup(); CoUninitialize(); } -- 2.15.1

1 0

[PATCH] Revert "user32/combo: Set listbox popup height correctly and add tests." (resend)
by Alistair Leslie-Hughes 10 Dec '17

10 Dec '17

From: Sebastian Lackner <sebastian(a)fds-team.de> This partly reverts commit f7f7b89e2e9117811c91269643868c6d063db5e9. (Tests are left inplace). Any application that currently uses "Microsoft.Windows.Common-Controls v6" via a Manifest has the possibility of breaking comboboxes. Using this version of the control ensures that dropdown for comboboxes, will show multiple items, regardless of its height in the resource. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/user32/combo.c | 8 ++++++++ dlls/user32/tests/combo.c | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 2f270e5..7d15ff7 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1044,6 +1044,14 @@ static void CBDropDown( LPHEADCOMBO lphc ) if (nHeight < nDroppedHeight - COMBO_YBORDERSIZE()) nDroppedHeight = nHeight + COMBO_YBORDERSIZE(); + + if (nDroppedHeight < nHeight) + { + if (nItems < 5) + nDroppedHeight = (nItems+1)*nIHeight; + else if (nDroppedHeight < 6*nIHeight) + nDroppedHeight = 6*nIHeight; + } } r.left = rect.left; diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index 0519ace..72e8777 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -718,25 +718,25 @@ static void test_listbox_size(DWORD style) int height_combo; BOOL todo; } info_height[] = { - {2, 24}, + {2, 24, TRUE}, {2, 41, TRUE}, - {2, 42}, - {2, 50}, + {2, 42, TRUE}, + {2, 50, TRUE}, {2, 60}, {2, 80}, {2, 89}, {2, 90}, {2, 100}, - {10, 24}, + {10, 24, TRUE}, {10, 41, TRUE}, - {10, 42}, - {10, 50}, - {10, 60}, - {10, 80}, + {10, 42, TRUE}, + {10, 50, TRUE}, + {10, 60, TRUE}, + {10, 80, TRUE}, {10, 89, TRUE}, - {10, 90}, - {10, 100}, + {10, 90, TRUE}, + {10, 100, TRUE}, }; pGetComboBoxInfo = (void *)GetProcAddress(GetModuleHandleA("user32.dll"), "GetComboBoxInfo"); -- 1.9.1

1 0

[PATCH 1/2] msvcp140: Implement _Temp_get.
by Stefan Dösinger 09 Dec '17

09 Dec '17

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- I tried to test what happens if the temp path is longer than MAX_PATH characters, but I could not get Windows to accept a long temp path. If %TMP% is longer than 100 characters (or somewhere in that area, I did not test the precise limit) it falls back to %TEMP%, %USERPROFILE% and finally "C:\Windows". I assume msvcp does not clear the extra bytes like GetTempPathW either because it doesn't call GetTempPath and implements the logic itself or because it writes to a temp buffer and copies the data. I don't know how to trigger this possible case even with a manual test on Windows. --- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp140/tests/msvcp140.c | 27 +++++++++++++++++++++++++++ dlls/msvcp90/ios.c | 6 ++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 4fc8e3c5d5..3cd1975adf 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3718,7 +3718,7 @@ @ stub _Strxfrm @ cdecl _Symlink(wstr wstr) tr2_sys__Symlink_wchar @ stub _Symlink_get -@ stub _Temp_get +@ cdecl _Temp_get(ptr) @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) _Thrd_create @ cdecl -norelay _Thrd_current() diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 620e9317c9..01ed89aceb 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -177,6 +177,7 @@ static WCHAR* (__cdecl *p_Read_dir)(WCHAR*, void*, enum file_type*); static MSVCP_bool (__cdecl *p_Remove_dir)(WCHAR const*); static enum file_type (__cdecl *p_Stat)(WCHAR const *, int *); static int (__cdecl *p_Symlink)(WCHAR const*, WCHAR const*); +static WCHAR* (__cdecl *p_Temp_get)(WCHAR *); static int (__cdecl *p_To_byte)(const WCHAR *src, char *dst); static int (__cdecl *p_To_wide)(const char *src, WCHAR *dst); static int (__cdecl *p_Unlink)(WCHAR const*); @@ -258,6 +259,7 @@ static BOOL init(void) SET(p_Remove_dir, "_Remove_dir"); SET(p_Stat, "_Stat"); SET(p_Symlink, "_Symlink"); + SET(p_Temp_get, "_Temp_get"); SET(p_To_byte, "_To_byte"); SET(p_To_wide, "_To_wide"); SET(p_Unlink, "_Unlink"); @@ -1054,6 +1056,30 @@ static void test_Unlink(void) ok(SetCurrentDirectoryW(current_path), "SetCurrentDirectoryW failed\n"); } +static void test_Temp_get(void) +{ + WCHAR path[MAX_PATH + 1], temp_path[MAX_PATH]; + WCHAR *retval; + DWORD len; + + GetTempPathW(sizeof(temp_path)/sizeof(*temp_path), temp_path); + + /* This crashes on Windows, the input pointer is not validated. */ + if (0) + { + retval = p_Temp_get(NULL); + ok(!retval, "_Temp_get(): Got %p\n", retval); + } + + memset(path, 0xaa, sizeof(path)); + retval = p_Temp_get(path); + ok(retval == path, "_Temp_get(): Got %p, expected %p\n", retval, path); + ok(!wcscmp(path, temp_path), "Expected path %s, got %s\n", wine_dbgstr_w(temp_path), wine_dbgstr_w(path)); + len = wcslen(path); + ok(!path[len], "Expected a 0 terminated string\n"); + todo_wine ok(path[len + 1] == 0xaaaa, "Too many bytes were zeroed - %x\n", path[len + 1]); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1071,5 +1097,6 @@ START_TEST(msvcp140) test_Stat(); test_dir_operation(); test_Unlink(); + test_Temp_get(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 3f859979cb..ab9d7a44a4 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -15745,6 +15745,12 @@ enum file_type __cdecl _Lstat(WCHAR const* path, int* permissions) return _Stat(path, permissions); } +WCHAR * __cdecl _Temp_get(WCHAR *dst) +{ + GetTempPathW(MAX_PATH, dst); + return dst; +} + /* ??1_Winit@std@@QAE@XZ */ /* ??1_Winit@std@@QAE@XZ */ DEFINE_THISCALL_WRAPPER(_Winit_dtor, 4) -- 2.13.6

2 3

[PATCH v3 2/8] dhtmled.ocx: Add stub DLL and stub DHTMLEdit object
by Alex Henrie 08 Dec '17

08 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v3: Combined dhtmled_classes.idl into dhtmled_tlb.idl --- configure.ac | 1 + dlls/dhtmled.ocx/Makefile.in | 8 + dlls/dhtmled.ocx/dhtmled.ocx.spec | 4 + dlls/dhtmled.ocx/dhtmled_private.h | 19 ++ dlls/dhtmled.ocx/dhtmled_tlb.idl | 22 ++ dlls/dhtmled.ocx/edit.c | 534 +++++++++++++++++++++++++++++++++++++ dlls/dhtmled.ocx/main.c | 162 +++++++++++ 7 files changed, 750 insertions(+) create mode 100644 dlls/dhtmled.ocx/Makefile.in create mode 100644 dlls/dhtmled.ocx/dhtmled.ocx.spec create mode 100644 dlls/dhtmled.ocx/dhtmled_private.h create mode 100644 dlls/dhtmled.ocx/dhtmled_tlb.idl create mode 100644 dlls/dhtmled.ocx/edit.c create mode 100644 dlls/dhtmled.ocx/main.c diff --git a/configure.ac b/configure.ac index 69fad417ba..dafbf6faa8 100644 --- a/configure.ac +++ b/configure.ac @@ -3091,6 +3091,7 @@ WINE_CONFIG_TEST(dlls/ddrawex/tests) WINE_CONFIG_DLL(devenum,,[clean]) WINE_CONFIG_TEST(dlls/devenum/tests) WINE_CONFIG_DLL(dhcpcsvc) +WINE_CONFIG_DLL(dhtmled.ocx) WINE_CONFIG_DLL(difxapi) WINE_CONFIG_DLL(dinput,,[clean,implib,staticimplib]) WINE_CONFIG_TEST(dlls/dinput/tests) diff --git a/dlls/dhtmled.ocx/Makefile.in b/dlls/dhtmled.ocx/Makefile.in new file mode 100644 index 0000000000..17850f8107 --- /dev/null +++ b/dlls/dhtmled.ocx/Makefile.in @@ -0,0 +1,8 @@ +MODULE = dhtmled.ocx +IMPORTS = uuid + +C_SRCS = \ + edit.c \ + main.c + +IDL_SRCS = dhtmled_tlb.idl diff --git a/dlls/dhtmled.ocx/dhtmled.ocx.spec b/dlls/dhtmled.ocx/dhtmled.ocx.spec new file mode 100644 index 0000000000..b16365d0c9 --- /dev/null +++ b/dlls/dhtmled.ocx/dhtmled.ocx.spec @@ -0,0 +1,4 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() diff --git a/dlls/dhtmled.ocx/dhtmled_private.h b/dlls/dhtmled.ocx/dhtmled_private.h new file mode 100644 index 0000000000..5a9e89b997 --- /dev/null +++ b/dlls/dhtmled.ocx/dhtmled_private.h @@ -0,0 +1,19 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +extern HRESULT dhtml_edit_create(REFIID iid, void **out); diff --git a/dlls/dhtmled.ocx/dhtmled_tlb.idl b/dlls/dhtmled.ocx/dhtmled_tlb.idl new file mode 100644 index 0000000000..96a9444a13 --- /dev/null +++ b/dlls/dhtmled.ocx/dhtmled_tlb.idl @@ -0,0 +1,22 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#pragma makedep register +#pragma makedep regtypelib + +#include "dhtmled.idl" diff --git a/dlls/dhtmled.ocx/edit.c b/dlls/dhtmled.ocx/edit.c new file mode 100644 index 0000000000..6e37554119 --- /dev/null +++ b/dlls/dhtmled.ocx/edit.c @@ -0,0 +1,534 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "dhtmled.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dhtmled); + +typedef struct +{ + IDHTMLEdit IDHTMLEdit_iface; + LONG ref; +} DHTMLEditImpl; + +static inline DHTMLEditImpl *impl_from_IDHTMLEdit(IDHTMLEdit *iface) +{ + return CONTAINING_RECORD(iface, DHTMLEditImpl, IDHTMLEdit_iface); +} + +static HRESULT WINAPI DHTMLEdit_QueryInterface(IDHTMLEdit *iface, REFIID iid, void **out) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(iid), out); + + if (IsEqualGUID(iid, &IID_IUnknown) || + IsEqualGUID(iid, &IID_IDispatch) || + IsEqualGUID(iid, &IID_IDHTMLSafe) || + IsEqualGUID(iid, &IID_IDHTMLEdit)) + { + IUnknown_AddRef(iface); + *out = iface; + return S_OK; + } + + *out = NULL; + ERR("no interface for %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI DHTMLEdit_AddRef(IDHTMLEdit *iface) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI DHTMLEdit_Release(IDHTMLEdit *iface) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +static HRESULT WINAPI DHTMLEdit_GetTypeInfoCount(IDHTMLEdit *iface, UINT *count) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, count); + *count = 0; + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_GetTypeInfo(IDHTMLEdit *iface, UINT type_index, LCID lcid, ITypeInfo **type_info) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%u, %08x, %p) stub\n", This, type_index, lcid, type_info); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_GetIDsOfNames(IDHTMLEdit *iface, REFIID iid, OLECHAR **names, UINT name_count, + LCID lcid, DISPID *disp_ids) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%s, %p, %u, %08x, %p) stub\n", This, debugstr_guid(iid), names, name_count, lcid, disp_ids); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_Invoke(IDHTMLEdit *iface, DISPID member, REFIID iid, LCID lcid, WORD flags, + DISPPARAMS *params, VARIANT *ret, EXCEPINFO *exception_info, UINT *error_index) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%d, %s, %08x, 0x%x, %p, %p, %p, %p) stub\n", + This, member, debugstr_guid(iid), lcid, flags, params, ret, exception_info, error_index); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_ExecCommand(IDHTMLEdit *iface, DHTMLEDITCMDID cmd_id, OLECMDEXECOPT options, + VARIANT *code_in, VARIANT *code_out) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%u, %u, %s, %p) stub\n", This, cmd_id, options, debugstr_variant(code_in), code_out); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_QueryStatus(IDHTMLEdit *iface, DHTMLEDITCMDID cmd_id, DHTMLEDITCMDF *status) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%u, %p) stub\n", This, cmd_id, status); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_SetContextMenu(IDHTMLEdit *iface, VARIANT *strings, VARIANT *states) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p, %p) stub\n", This, strings, states); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_NewDocument(IDHTMLEdit *iface) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->() stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_LoadURL(IDHTMLEdit *iface, BSTR url) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(url)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_FilterSourceCode(IDHTMLEdit *iface, BSTR in, BSTR *out) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%s, %p)\n", This, debugstr_w(in), out); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_Refresh(IDHTMLEdit *iface) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->() stub\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_DOM(IDHTMLEdit *iface, IHTMLDocument2 **value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_DocumentHTML(IDHTMLEdit *iface, BSTR *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_DocumentHTML(IDHTMLEdit *iface, BSTR html) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%s) stub\n", This, debugstr_w(html)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_ActivateApplets(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_ActivateApplets(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_ActivateActiveXControls(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_ActivateActiveXControls(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_ActivateDTCs(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_ActivateDTCs(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_ShowDetails(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_ShowDetails(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_ShowBorders(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_ShowBorders(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_Appearance(IDHTMLEdit *iface, DHTMLEDITAPPEARANCE *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_Appearance(IDHTMLEdit *iface, DHTMLEDITAPPEARANCE value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%u) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_Scrollbars(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_Scrollbars(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_ScrollbarAppearance(IDHTMLEdit *iface, DHTMLEDITAPPEARANCE *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_ScrollbarAppearance(IDHTMLEdit *iface, DHTMLEDITAPPEARANCE value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%u) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_SourceCodePreservation(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_SourceCodePreservation(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_AbsoluteDropMode(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_AbsoluteDropMode(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_SnapToGridX(IDHTMLEdit *iface, LONG *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_SnapToGridX(IDHTMLEdit *iface, LONG value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%d) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_SnapToGridY(IDHTMLEdit *iface, LONG *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_SnapToGridY(IDHTMLEdit *iface, LONG value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%d) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_SnapToGrid(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_SnapToGrid(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_IsDirty(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_CurrentDocumentPath(IDHTMLEdit *iface, BSTR *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_BaseURL(IDHTMLEdit *iface, BSTR *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_BaseURL(IDHTMLEdit *iface, BSTR value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%s) stub\n", This, debugstr_w(value)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_DocumentTitle(IDHTMLEdit *iface, BSTR *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_UseDivOnCarriageReturn(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_UseDivOnCarriageReturn(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_Busy(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_LoadDocument(IDHTMLEdit *iface, VARIANT *path, VARIANT *prompt) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%s, %s) stub\n", This, debugstr_variant(path), debugstr_variant(prompt)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_SaveDocument(IDHTMLEdit *iface, VARIANT *path, VARIANT *prompt) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%s, %s) stub\n", This, debugstr_variant(path), debugstr_variant(prompt)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_PrintDocument(IDHTMLEdit *iface, VARIANT *prompt) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%s) stub\n", This, debugstr_variant(prompt)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_get_BrowseMode(IDHTMLEdit *iface, VARIANT_BOOL *value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%p) stub\n", This, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI DHTMLEdit_put_BrowseMode(IDHTMLEdit *iface, VARIANT_BOOL value) +{ + DHTMLEditImpl *This = impl_from_IDHTMLEdit(iface); + FIXME("(%p)->(%04x) stub\n", This, value); + return E_NOTIMPL; +} + +static const IDHTMLEditVtbl DHTMLEditVtbl = { + DHTMLEdit_QueryInterface, + DHTMLEdit_AddRef, + DHTMLEdit_Release, + DHTMLEdit_GetTypeInfoCount, + DHTMLEdit_GetTypeInfo, + DHTMLEdit_GetIDsOfNames, + DHTMLEdit_Invoke, + DHTMLEdit_ExecCommand, + DHTMLEdit_QueryStatus, + DHTMLEdit_SetContextMenu, + DHTMLEdit_NewDocument, + DHTMLEdit_LoadURL, + DHTMLEdit_FilterSourceCode, + DHTMLEdit_Refresh, + DHTMLEdit_get_DOM, + DHTMLEdit_get_DocumentHTML, + DHTMLEdit_put_DocumentHTML, + DHTMLEdit_get_ActivateApplets, + DHTMLEdit_put_ActivateApplets, + DHTMLEdit_get_ActivateActiveXControls, + DHTMLEdit_put_ActivateActiveXControls, + DHTMLEdit_get_ActivateDTCs, + DHTMLEdit_put_ActivateDTCs, + DHTMLEdit_get_ShowDetails, + DHTMLEdit_put_ShowDetails, + DHTMLEdit_get_ShowBorders, + DHTMLEdit_put_ShowBorders, + DHTMLEdit_get_Appearance, + DHTMLEdit_put_Appearance, + DHTMLEdit_get_Scrollbars, + DHTMLEdit_put_Scrollbars, + DHTMLEdit_get_ScrollbarAppearance, + DHTMLEdit_put_ScrollbarAppearance, + DHTMLEdit_get_SourceCodePreservation, + DHTMLEdit_put_SourceCodePreservation, + DHTMLEdit_get_AbsoluteDropMode, + DHTMLEdit_put_AbsoluteDropMode, + DHTMLEdit_get_SnapToGridX, + DHTMLEdit_put_SnapToGridX, + DHTMLEdit_get_SnapToGridY, + DHTMLEdit_put_SnapToGridY, + DHTMLEdit_get_SnapToGrid, + DHTMLEdit_put_SnapToGrid, + DHTMLEdit_get_IsDirty, + DHTMLEdit_get_CurrentDocumentPath, + DHTMLEdit_get_BaseURL, + DHTMLEdit_put_BaseURL, + DHTMLEdit_get_DocumentTitle, + DHTMLEdit_get_UseDivOnCarriageReturn, + DHTMLEdit_put_UseDivOnCarriageReturn, + DHTMLEdit_get_Busy, + DHTMLEdit_LoadDocument, + DHTMLEdit_SaveDocument, + DHTMLEdit_PrintDocument, + DHTMLEdit_get_BrowseMode, + DHTMLEdit_put_BrowseMode +}; + +HRESULT dhtml_edit_create(REFIID iid, void **out) +{ + DHTMLEditImpl *This; + + TRACE("(%s, %p)\n", debugstr_guid(iid), out); + + *out = NULL; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + if (!This) + return E_OUTOFMEMORY; + + This->IDHTMLEdit_iface.lpVtbl = &DHTMLEditVtbl; + This->ref = 1; + + *out = &This->IDHTMLEdit_iface; + return S_OK; +} diff --git a/dlls/dhtmled.ocx/main.c b/dlls/dhtmled.ocx/main.c new file mode 100644 index 0000000000..4640884934 --- /dev/null +++ b/dlls/dhtmled.ocx/main.c @@ -0,0 +1,162 @@ +/* + * Dynamic HyperText Markup Language Editing Control + * + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "initguid.h" +#include "dhtmled.h" +#include "dhtmled_private.h" +#include "rpcproxy.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dhtmled); + +typedef struct +{ + IClassFactory IClassFactory_iface; + HRESULT (*create)(REFIID iid, void **out); +} ClassFactoryImpl; + +static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) +{ + return CONTAINING_RECORD(iface, ClassFactoryImpl, IClassFactory_iface); +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID iid, void **out) +{ + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(iid), out); + + if (IsEqualGUID(&IID_IUnknown, iid) || IsEqualGUID(&IID_IClassFactory, iid)) + { + *out = iface; + IClassFactory_AddRef(iface); + return S_OK; + } + + *out = NULL; + WARN("no interface for %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + return 2; /* non-heap based object */ +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + return 1; /* non-heap based object */ +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID iid, void **out) +{ + ClassFactoryImpl *This = impl_from_IClassFactory(iface); + + TRACE("(%p)->(%p, %s, %p)\n", iface, outer, debugstr_guid(iid), out); + + if (outer) + return CLASS_E_NOAGGREGATION; + + return This->create(iid, out); +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL lock) +{ + TRACE("(%p)->(%x)\n", iface, lock); + return S_OK; +} + +static const IClassFactoryVtbl ClassFactoryVtbl = { + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +static HINSTANCE dhtmled_instance; + +/****************************************************************** + * DllMain (dhtmled.ocx.@) + */ +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, VOID *reserved) +{ + TRACE("(%p, %u, %p)\n", instance, reason, reserved); + + switch (reason) + { + case DLL_WINE_PREATTACH: + /* Applications that use dhtmled.ocx usually install and register it + * themselves, but do not install its dependency triedit.dll. + * Because Wine's (currently nonexistent) triedit.dll implementation + * is not sufficient for native dhtmled.ocx, prefer our own. */ + return TRUE; + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + dhtmled_instance = instance; + break; + } + + return TRUE; +} + +/*********************************************************************** + * DllGetClassObject (dhtmled.ocx.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *out) +{ + static ClassFactoryImpl dhtml_edit_cf = { {&ClassFactoryVtbl}, dhtml_edit_create }; + + TRACE("(%s, %s, %p)\n", debugstr_guid(clsid), debugstr_guid(iid), out); + + if (IsEqualGUID(clsid, &CLSID_DHTMLEdit)) + return IClassFactory_QueryInterface(&dhtml_edit_cf.IClassFactory_iface, iid, out); + + FIXME("no class for %s\n", debugstr_guid(clsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} + +/*********************************************************************** + * DllCanUnloadNow (dhtmled.ocx.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + TRACE("()\n"); + return S_FALSE; +} + +/*********************************************************************** + * DllRegisterServer (dhtmled.ocx.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + TRACE("()\n"); + return __wine_register_resources(dhtmled_instance); +} + +/*********************************************************************** + * DllUnregisterServer (dhtmled.ocx.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + TRACE("()\n"); + return __wine_unregister_resources(dhtmled_instance); +} -- 2.15.1

2 4

[PATCH v4 1/8] include: Add dhtmled.idl and dhtmldid.h
by Alex Henrie 08 Dec '17

08 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v4: Added threading attribute to DHTMLEdit and DHTMLSafe --- include/Makefile.in | 2 + include/dhtmldid.h | 67 +++++ include/dhtmled.idl | 718 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 787 insertions(+) create mode 100644 include/dhtmldid.h create mode 100644 include/dhtmled.idl diff --git a/include/Makefile.in b/include/Makefile.in index fa1e42738b..430c4733af 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -58,6 +58,7 @@ IDL_SRCS = \ ddstream.idl \ devenum.idl \ devicetopology.idl \ + dhtmled.idl \ dimm.idl \ dispex.idl \ docobj.idl \ @@ -342,6 +343,7 @@ HEADER_SRCS = \ devpkey.h \ devpropdef.h \ dhcpcsdk.h \ + dhtmldid.h \ difxapi.h \ digitalv.h \ dinput.h \ diff --git a/include/dhtmldid.h b/include/dhtmldid.h new file mode 100644 index 0000000000..85c286a102 --- /dev/null +++ b/include/dhtmldid.h @@ -0,0 +1,67 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define DISPID_LOADDOCUMENT 1 +#define DISPID_EXECCOMMAND 2 +#define DISPID_QUERYSTATUS 3 +#define DISPID_SAVEDOCUMENT 4 +#define DISPID_SETCONTEXTMENU 5 +#define DISPID_DOCUMENT 6 +#define DISPID_ACTIVATEAPPLETS 7 +#define DISPID_ACTIVATEACTIVEXCONTROLS 8 +#define DISPID_ACTIVATEDTCS 9 +#define DISPID_SHOWDETAILS 11 +#define DISPID_SHOWBORDERS 12 +#define DISPID_DHTMLEDITAPPEARANCE 13 +#define DISPID_DHTMLEDITSCROLLBARS 14 +#define DISPID_SCROLLBARAPPEARANCE 15 +#define DISPID_SOURCECODEPRESERVATION 16 +#define DISPID_DOCUMENTHTML 17 +#define DISPID_ABSOLUTEDROPMODE 18 +#define DISPID_SNAPTOGRIDX 19 +#define DISPID_SNAPTOGRIDY 20 +#define DISPID_SNAPTOGRID 21 +#define DISPID_ISDIRTY 22 +#define DISPID_CURRENTDOCUMENTPATH 23 +#define DISPID_BASEURL 24 +#define DISPID_DOCUMENTTITLE 25 +#define DISPID_BROWSEMODE 26 +#define DISPID_NEWDOCUMENT 27 +#define DISPID_PRINT 28 +#define DISPID_LOADURL 29 +#define DISPID_USEDIVONCR 30 +#define DISPID_FILTERSRCCODE 31 +#define DISPID_REFRESHDOC 32 +#define DISPID_BUSY 33 + +#define DISPID_DOCUMENTCOMPLETE 1 +#define DISPID_DISPLAYCHANGED 2 +#define DISPID_SHOWCONTEXTMENU 3 +#define DISPID_CONTEXTMENUACTION 4 +#define DISPID_ONMOUSEDOWN 5 +#define DISPID_ONMOUSEMOVE 6 +#define DISPID_ONMOUSEUP 7 +#define DISPID_ONMOUSEOUT 8 +#define DISPID_ONMOUSEOVER 9 +#define DISPID_ONCLICK 10 +#define DISPID_ONDBLCLICK 11 +#define DISPID_ONKEYDOWN 12 +#define DISPID_ONKEYPRESS 13 +#define DISPID_ONKEYUP 14 +#define DISPID_ONBLUR 15 +#define DISPID_ONREADYSTATECHANGE 16 diff --git a/include/dhtmled.idl b/include/dhtmled.idl new file mode 100644 index 0000000000..ce65fb98d2 --- /dev/null +++ b/include/dhtmled.idl @@ -0,0 +1,718 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "docobj.idl"; +import "mshtml.idl"; + +#include "dhtmldid.h" + +[ + uuid(683364a1-b37d-11d1-adc5-006008a5848c), + version(1.0) +] +library DHTMLEDLib +{ + importlib("stdole2.tlb"); + + typedef + [ + uuid(7179FC44-B2E4-11d1-ADC5-006008A5848C) + ] + enum DHTMLEDITAPPEARANCE { + DEAPPEARANCE_FLAT, + DEAPPEARANCE_3D + } DHTMLEDITAPPEARANCE; + + typedef + [ + uuid(bf82426a-b961-11d1-adc5-006008a5848c) + ] + enum DHTMLEDITCMDF { + DECMDF_NOTSUPPORTED = 0, + DECMDF_DISABLED = 1, + DECMDF_ENABLED = 3, + DECMDF_LATCHED = 7, + DECMDF_NINCHED = 11 + } DHTMLEDITCMDF; + + typedef enum DHTMLEDITCMDID { + DECMD_BOLD = 5000, + DECMD_COPY = 5002, + DECMD_CUT, + DECMD_DELETE, + DECMD_DELETECELLS, + DECMD_DELETECOLS, + DECMD_DELETEROWS, + DECMD_FINDTEXT, + DECMD_FONT, + DECMD_GETBACKCOLOR, + DECMD_GETBLOCKFMT, + DECMD_GETBLOCKFMTNAMES, + DECMD_GETFONTNAME, + DECMD_GETFONTSIZE, + DECMD_GETFORECOLOR, + DECMD_HYPERLINK, + DECMD_IMAGE, + DECMD_INDENT, + DECMD_INSERTCELL, + DECMD_INSERTCOL, + DECMD_INSERTROW, + DECMD_INSERTTABLE, + DECMD_ITALIC, + DECMD_JUSTIFYCENTER, + DECMD_JUSTIFYLEFT, + DECMD_JUSTIFYRIGHT, + DECMD_LOCK_ELEMENT, + DECMD_MAKE_ABSOLUTE, + DECMD_MERGECELLS, + DECMD_ORDERLIST, + DECMD_OUTDENT, + DECMD_PASTE, + DECMD_REDO, + DECMD_REMOVEFORMAT, + DECMD_SELECTALL, + DECMD_SEND_BACKWARD, + DECMD_BRING_FORWARD, + DECMD_SEND_BELOW_TEXT, + DECMD_BRING_ABOVE_TEXT, + DECMD_SEND_TO_BACK, + DECMD_BRING_TO_FRONT, + DECMD_SETBACKCOLOR, + DECMD_SETBLOCKFMT, + DECMD_SETFONTNAME, + DECMD_SETFONTSIZE, + DECMD_SETFORECOLOR, + DECMD_SPLITCELL, + DECMD_UNDERLINE, + DECMD_UNDO, + DECMD_UNLINK, + DECMD_UNORDERLIST, + DECMD_PROPERTIES + } DHTMLEDITCMDID; + + [ + object, + uuid(ce04b590-2b1f-11d2-8d1e-00a0c959bc0a), + dual, + pointer_default(unique) + ] + interface IDHTMLSafe : IDispatch + { + [ + id(DISPID_EXECCOMMAND) + ] + HRESULT ExecCommand( + [in] DHTMLEDITCMDID cmd_id, + [in, defaultvalue(OLECMDEXECOPT_DODEFAULT)] OLECMDEXECOPT options, + [in, optional] VARIANT *code_in, + [out, retval] VARIANT *code_out + ); + + [ + id(DISPID_QUERYSTATUS) + ] + HRESULT QueryStatus( + [in] DHTMLEDITCMDID cmd_id, + [out, retval] DHTMLEDITCMDF *status + ); + + [ + id(DISPID_SETCONTEXTMENU) + ] + HRESULT SetContextMenu( + [in] VARIANT *strings, + [in] VARIANT *states + ); + + [ + id(DISPID_NEWDOCUMENT) + ] + HRESULT NewDocument(); + + [ + id(DISPID_LOADURL) + ] + HRESULT LoadURL( + [in] BSTR url + ); + + [ + id(DISPID_FILTERSRCCODE) + ] + HRESULT FilterSourceCode( + [in] BSTR in, + [out, retval] BSTR *out + ); + + [ + id(DISPID_REFRESHDOC) + ] + HRESULT Refresh(); + + [ + propget, + id(DISPID_DOCUMENT) + ] + HRESULT DOM( + [out, retval] IHTMLDocument2 **value + ); + + [ + propget, + id(DISPID_DOCUMENTHTML) + ] + HRESULT DocumentHTML( + [out, retval] BSTR *value + ); + + [ + propput, + id(DISPID_DOCUMENTHTML) + ] + HRESULT DocumentHTML( + [in] BSTR html + ); + + [ + propget, + id(DISPID_ACTIVATEAPPLETS) + ] + HRESULT ActivateApplets( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_ACTIVATEAPPLETS) + ] + HRESULT ActivateApplets( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_ACTIVATEACTIVEXCONTROLS) + ] + HRESULT ActivateActiveXControls( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_ACTIVATEACTIVEXCONTROLS) + ] + HRESULT ActivateActiveXControls( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_ACTIVATEDTCS) + ] + HRESULT ActivateDTCs( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_ACTIVATEDTCS) + ] + HRESULT ActivateDTCs( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_SHOWDETAILS) + ] + HRESULT ShowDetails( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_SHOWDETAILS) + ] + HRESULT ShowDetails( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_SHOWBORDERS) + ] + HRESULT ShowBorders( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_SHOWBORDERS) + ] + HRESULT ShowBorders( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_DHTMLEDITAPPEARANCE) + ] + HRESULT Appearance( + [out, retval] DHTMLEDITAPPEARANCE *value + ); + + [ + propput, + id(DISPID_DHTMLEDITAPPEARANCE) + ] + HRESULT Appearance( + [in] DHTMLEDITAPPEARANCE value + ); + + [ + propget, + id(DISPID_DHTMLEDITSCROLLBARS) + ] + HRESULT Scrollbars( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_DHTMLEDITSCROLLBARS) + ] + HRESULT Scrollbars( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_SCROLLBARAPPEARANCE) + ] + HRESULT ScrollbarAppearance( + [out, retval] DHTMLEDITAPPEARANCE *value + ); + + [ + propput, + id(DISPID_SCROLLBARAPPEARANCE) + ] + HRESULT ScrollbarAppearance( + [in] DHTMLEDITAPPEARANCE value + ); + + [ + propget, + id(DISPID_SOURCECODEPRESERVATION) + ] + HRESULT SourceCodePreservation( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_SOURCECODEPRESERVATION) + ] + HRESULT SourceCodePreservation( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_ABSOLUTEDROPMODE) + ] + HRESULT AbsoluteDropMode( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_ABSOLUTEDROPMODE) + ] + HRESULT AbsoluteDropMode( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_SNAPTOGRIDX) + ] + HRESULT SnapToGridX( + [out, retval] long *value + ); + + [ + propput, + id(DISPID_SNAPTOGRIDX) + ] + HRESULT SnapToGridX( + [in] long value + ); + + [ + propget, + id(DISPID_SNAPTOGRIDY) + ] + HRESULT SnapToGridY( + [out, retval] long *value + ); + + [ + propput, + id(DISPID_SNAPTOGRIDY) + ] + HRESULT SnapToGridY( + [in] long value + ); + + [ + propget, + id(DISPID_SNAPTOGRID) + ] + HRESULT SnapToGrid( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_SNAPTOGRID) + ] + HRESULT SnapToGrid( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_ISDIRTY) + ] + HRESULT IsDirty( + [out, retval] VARIANT_BOOL *value + ); + + [ + propget, + id(DISPID_CURRENTDOCUMENTPATH) + ] + HRESULT CurrentDocumentPath( + [out, retval] BSTR *value + ); + + [ + propget, + id(DISPID_BASEURL) + ] + HRESULT BaseURL( + [out, retval] BSTR *value + ); + + [ + propput, + id(DISPID_BASEURL) + ] + HRESULT BaseURL( + [in] BSTR value + ); + + [ + propget, + id(DISPID_DOCUMENTTITLE) + ] + HRESULT DocumentTitle( + [out, retval] BSTR *value + ); + + [ + propget, + id(DISPID_USEDIVONCR) + ] + HRESULT UseDivOnCarriageReturn( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_USEDIVONCR) + ] + HRESULT UseDivOnCarriageReturn( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_BUSY) + ] + HRESULT Busy( + [out, retval] VARIANT_BOOL *value + ); + }; + + [ + uuid(d1fc78e8-b380-11d1-adc5-006008a5848c) + ] + dispinterface _DHTMLSafeEvents + { + properties: + methods: + [ + id(DISPID_DOCUMENTCOMPLETE) + ] + void DocumentComplete(); + + [ + id(DISPID_DISPLAYCHANGED) + ] + void DisplayChanged(); + + [ + id(DISPID_SHOWCONTEXTMENU) + ] + void ShowContextMenu( + [in] long x, + [in] long y + ); + + [ + id(DISPID_CONTEXTMENUACTION) + ] + void ContextMenuAction( + [in] long index + ); + + [ + id(DISPID_ONMOUSEDOWN) + ] + void onmousedown(); + + [ + id(DISPID_ONMOUSEMOVE) + ] + void onmousemove(); + + [ + id(DISPID_ONMOUSEUP) + ] + void onmouseup(); + + [ + id(DISPID_ONMOUSEOUT) + ] + void onmouseout(); + + [ + id(DISPID_ONMOUSEOVER) + ] + void onmouseover(); + + [ + id(DISPID_ONCLICK) + ] + void onclick(); + + [ + id(DISPID_ONDBLCLICK) + ] + void ondblclick(); + + [ + id(DISPID_ONKEYDOWN) + ] + void onkeydown(); + + [ + id(DISPID_ONKEYPRESS) + ] + void onkeypress(); + + [ + id(DISPID_ONKEYUP) + ] + void onkeyup(); + + [ + id(DISPID_ONBLUR) + ] + void onblur(); + + [ + id(DISPID_ONREADYSTATECHANGE) + ] + void onreadystatechange(); + }; + + [ + uuid(2d360201-fff5-11d1-8d03-00a0c959bc0a), + threading(apartment) + ] + coclass DHTMLSafe + { + [default] interface IDHTMLSafe; + [default, source] interface _DHTMLSafeEvents; + }; + + [ + uuid(ce04b591-2b1f-11d2-8d1e-00a0c959bc0a), + dual, + pointer_default(unique) + ] + interface IDHTMLEdit : IDHTMLSafe + { + [ + id(DISPID_LOADDOCUMENT) + ] + HRESULT LoadDocument( + [in] VARIANT *path, + [in, optional] VARIANT *prompt + ); + + [ + id(DISPID_SAVEDOCUMENT) + ] + HRESULT SaveDocument( + [in] VARIANT *path, + [in, optional] VARIANT *prompt + ); + + [ + id(DISPID_PRINT) + ] + HRESULT PrintDocument( + [in, optional] VARIANT *prompt + ); + + [ + propget, + id(DISPID_BROWSEMODE) + ] + HRESULT BrowseMode( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_BROWSEMODE) + ] + HRESULT BrowseMode( + [in] VARIANT_BOOL value + ); + }; + + [ + uuid(588d5040-cf28-11d1-8cd3-00a0c959bc0a) + ] + dispinterface _DHTMLEditEvents + { + properties: + methods: + [ + id(DISPID_DOCUMENTCOMPLETE) + ] + void DocumentComplete(); + + [ + id(DISPID_DISPLAYCHANGED) + ] + void DisplayChanged(); + + [ + id(DISPID_SHOWCONTEXTMENU) + ] + void ShowContextMenu( + [in] long x, + [in] long y + ); + + [ + id(DISPID_CONTEXTMENUACTION) + ] + void ContextMenuAction( + [in] long index + ); + + [ + id(DISPID_ONMOUSEDOWN) + ] + void onmousedown(); + + [ + id(DISPID_ONMOUSEMOVE) + ] + void onmousemove(); + + [ + id(DISPID_ONMOUSEUP) + ] + void onmouseup(); + + [ + id(DISPID_ONMOUSEOUT) + ] + void onmouseout(); + + [ + id(DISPID_ONMOUSEOVER) + ] + void onmouseover(); + + [ + id(DISPID_ONCLICK) + ] + void onclick(); + + [ + id(DISPID_ONDBLCLICK) + ] + void ondblclick(); + + [ + id(DISPID_ONKEYDOWN) + ] + void onkeydown(); + + [ + id(DISPID_ONKEYPRESS) + ] + void onkeypress(); + + [ + id(DISPID_ONKEYUP) + ] + void onkeyup(); + + [ + id(DISPID_ONBLUR) + ] + void onblur(); + + [ + id(DISPID_ONREADYSTATECHANGE) + ] + void onreadystatechange(); + }; + + [ + uuid(2d360200-fff5-11d1-8d03-00a0c959bc0a), + threading(apartment) + ] + coclass DHTMLEdit + { + [default] interface IDHTMLEdit; + [default, source] interface _DHTMLEditEvents; + }; +} -- 2.15.1

2 1

[PATCH] wined3d: Avoid calling removed/deprecated GL functions in SetupForBlit().
by Józef Kucia 08 Dec '17

08 Dec '17

Eliminates possible GL errors when core contexts are used. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/context.c | 139 ++++++++++++++++++++++++++----------------------- 1 file changed, 74 insertions(+), 65 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 23f63aacda21..2e12d7521363 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2323,10 +2323,13 @@ static void set_blit_dimension(const struct wined3d_gl_info *gl_info, UINT width -1.0, -1.0, -1.0, 1.0, }; - gl_info->gl_ops.gl.p_glMatrixMode(GL_PROJECTION); - checkGLcall("glMatrixMode(GL_PROJECTION)"); - gl_info->gl_ops.gl.p_glLoadMatrixd(projection); - checkGLcall("glLoadMatrixd"); + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + gl_info->gl_ops.gl.p_glMatrixMode(GL_PROJECTION); + checkGLcall("glMatrixMode(GL_PROJECTION)"); + gl_info->gl_ops.gl.p_glLoadMatrixd(projection); + checkGLcall("glLoadMatrixd"); + } gl_info->gl_ops.gl.p_glViewport(0, 0, width, height); checkGLcall("glViewport"); } @@ -2398,10 +2401,10 @@ void context_enable_clip_distances(struct wined3d_context *context, unsigned int /* Context activation is done by the caller. */ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_context *context) { - int i; const struct wined3d_gl_info *gl_info = context->gl_info; DWORD sampler; SIZE rt_size; + int i; TRACE("Setting up context %p for blitting\n", context); @@ -2422,17 +2425,46 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con } context->last_was_blit = TRUE; - /* Disable all textures. The caller can then bind a texture it wants to blit - * from - * - * The blitting code uses (for now) the fixed function pipeline, so make sure to reset all fixed - * function texture unit. No need to care for higher samplers - */ - for (i = gl_info->limits.textures - 1; i > 0 ; --i) + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) { - sampler = context->rev_tex_unit_map[i]; - context_active_texture(context, gl_info, i); + /* Disable all textures. The caller can then bind a texture it wants to blit + * from + * + * The blitting code uses (for now) the fixed function pipeline, so make sure to reset all fixed + * function texture unit. No need to care for higher samplers + */ + for (i = gl_info->limits.textures - 1; i > 0 ; --i) + { + sampler = context->rev_tex_unit_map[i]; + context_active_texture(context, gl_info, i); + if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) + { + gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); + checkGLcall("glDisable GL_TEXTURE_CUBE_MAP_ARB"); + } + gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_3D); + checkGLcall("glDisable GL_TEXTURE_3D"); + if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) + { + gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_RECTANGLE_ARB); + checkGLcall("glDisable GL_TEXTURE_RECTANGLE_ARB"); + } + gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D); + checkGLcall("glDisable GL_TEXTURE_2D"); + + gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + checkGLcall("glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);"); + + if (sampler != WINED3D_UNMAPPED_STAGE) + { + if (sampler < MAX_TEXTURES) + context_invalidate_state(context, STATE_TEXTURESTAGE(sampler, WINED3D_TSS_COLOR_OP)); + context_invalidate_state(context, STATE_SAMPLER(sampler)); + } + } + + context_active_texture(context, gl_info, 0); if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) { gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); @@ -2449,50 +2481,43 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con checkGLcall("glDisable GL_TEXTURE_2D"); gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); - checkGLcall("glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);"); - if (sampler != WINED3D_UNMAPPED_STAGE) + gl_info->gl_ops.gl.p_glMatrixMode(GL_TEXTURE); + checkGLcall("glMatrixMode(GL_TEXTURE)"); + gl_info->gl_ops.gl.p_glLoadIdentity(); + checkGLcall("glLoadIdentity()"); + + if (gl_info->supported[EXT_TEXTURE_LOD_BIAS]) { - if (sampler < MAX_TEXTURES) - context_invalidate_state(context, STATE_TEXTURESTAGE(sampler, WINED3D_TSS_COLOR_OP)); - context_invalidate_state(context, STATE_SAMPLER(sampler)); + gl_info->gl_ops.gl.p_glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, + GL_TEXTURE_LOD_BIAS_EXT, 0.0f); + checkGLcall("glTexEnvf GL_TEXTURE_LOD_BIAS_EXT ..."); } + + /* Setup transforms */ + gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW); + checkGLcall("glMatrixMode(GL_MODELVIEW)"); + gl_info->gl_ops.gl.p_glLoadIdentity(); + checkGLcall("glLoadIdentity()"); + context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))); + + /* Other misc states */ + gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); + checkGLcall("glDisable(GL_ALPHA_TEST)"); + context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ALPHATESTENABLE)); + gl_info->gl_ops.gl.p_glDisable(GL_LIGHTING); + checkGLcall("glDisable GL_LIGHTING"); + context_invalidate_state(context, STATE_RENDER(WINED3D_RS_LIGHTING)); + glDisableWINE(GL_FOG); + checkGLcall("glDisable GL_FOG"); + context_invalidate_state(context, STATE_RENDER(WINED3D_RS_FOGENABLE)); } + if (gl_info->supported[ARB_SAMPLER_OBJECTS]) GL_EXTCALL(glBindSampler(0, 0)); context_active_texture(context, gl_info, 0); sampler = context->rev_tex_unit_map[0]; - - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); - checkGLcall("glDisable GL_TEXTURE_CUBE_MAP_ARB"); - } - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_3D); - checkGLcall("glDisable GL_TEXTURE_3D"); - if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) - { - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_RECTANGLE_ARB); - checkGLcall("glDisable GL_TEXTURE_RECTANGLE_ARB"); - } - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D); - checkGLcall("glDisable GL_TEXTURE_2D"); - - gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); - - gl_info->gl_ops.gl.p_glMatrixMode(GL_TEXTURE); - checkGLcall("glMatrixMode(GL_TEXTURE)"); - gl_info->gl_ops.gl.p_glLoadIdentity(); - checkGLcall("glLoadIdentity()"); - - if (gl_info->supported[EXT_TEXTURE_LOD_BIAS]) - { - gl_info->gl_ops.gl.p_glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, - GL_TEXTURE_LOD_BIAS_EXT, 0.0f); - checkGLcall("glTexEnvf GL_TEXTURE_LOD_BIAS_EXT ..."); - } - if (sampler != WINED3D_UNMAPPED_STAGE) { if (sampler < MAX_TEXTURES) @@ -2504,18 +2529,9 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con } /* Other misc states */ - gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); - checkGLcall("glDisable(GL_ALPHA_TEST)"); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ALPHATESTENABLE)); - gl_info->gl_ops.gl.p_glDisable(GL_LIGHTING); - checkGLcall("glDisable GL_LIGHTING"); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_LIGHTING)); gl_info->gl_ops.gl.p_glDisable(GL_DEPTH_TEST); checkGLcall("glDisable GL_DEPTH_TEST"); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ZENABLE)); - glDisableWINE(GL_FOG); - checkGLcall("glDisable GL_FOG"); - context_invalidate_state(context, STATE_RENDER(WINED3D_RS_FOGENABLE)); gl_info->gl_ops.gl.p_glDisable(GL_BLEND); checkGLcall("glDisable GL_BLEND"); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ALPHABLENDENABLE)); @@ -2547,13 +2563,6 @@ static void SetupForBlit(const struct wined3d_device *device, struct wined3d_con checkGLcall("glDisable(GL_COLOR_SUM_EXT)"); } - /* Setup transforms */ - gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW); - checkGLcall("glMatrixMode(GL_MODELVIEW)"); - gl_info->gl_ops.gl.p_glLoadIdentity(); - checkGLcall("glLoadIdentity()"); - context_invalidate_state(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))); - context->last_was_rhw = TRUE; context_invalidate_state(context, STATE_VDECL); /* because of last_was_rhw = TRUE */ -- 2.13.6

4 4

[PATCH v2 1/2] d3d11/tests: Add test for depth bias.
by Józef Kucia 08 Dec '17

08 Dec '17

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: * Use int for signed integers * Remove sqrtf(m *m) * Increase tolerance for floating-point slope scaled depth bias test to 140 --- dlls/d3d11/tests/d3d11.c | 315 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 298 insertions(+), 17 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 7d317dc1817c..bf62b48b8730 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -19,12 +19,13 @@ #include <assert.h> #include <float.h> +#include <limits.h> +#include <math.h> #include <stdlib.h> #define COBJMACROS #include "initguid.h" #include "d3d11_1.h" #include "wine/test.h" -#include <limits.h> #ifndef ARRAY_SIZE #define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) @@ -1247,14 +1248,14 @@ static void draw_quad_vs(unsigned int line, struct d3d11_test_context *context, { static const D3D11_INPUT_ELEMENT_DESC default_layout_desc[] = { - {"POSITION", 0, DXGI_FORMAT_R32G32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, + {"POSITION", 0, DXGI_FORMAT_R32G32B32_FLOAT, 0, 0, D3D11_INPUT_PER_VERTEX_DATA, 0}, }; - static const struct vec2 quad[] = + static const struct vec3 quad[] = { - {-1.0f, -1.0f}, - {-1.0f, 1.0f}, - { 1.0f, -1.0f}, - { 1.0f, 1.0f}, + {-1.0f, -1.0f, 0.0f}, + {-1.0f, 1.0f, 0.0f}, + { 1.0f, -1.0f, 0.0f}, + { 1.0f, 1.0f, 0.0f}, }; ID3D11Device *device = context->device; @@ -15235,12 +15236,12 @@ static void test_face_culling(void) 0x00000000, 0x3f800000, 0x00000000, 0x3f800000, 0x00004002, 0x00000000, 0x00000000, 0x3f800000, 0x3f800000, 0x0100003e, }; - static const struct vec2 ccw_quad[] = + static const struct vec3 ccw_quad[] = { - {-1.0f, 1.0f}, - {-1.0f, -1.0f}, - { 1.0f, 1.0f}, - { 1.0f, -1.0f}, + {-1.0f, 1.0f, 0.0f}, + {-1.0f, -1.0f, 0.0f}, + { 1.0f, 1.0f, 0.0f}, + { 1.0f, -1.0f, 0.0f}, }; static const struct { @@ -16115,12 +16116,12 @@ static void test_stencil_separate(void) static const float red[] = {1.0f, 0.0f, 0.0f, 1.0f}; static const struct vec4 green = {0.0f, 1.0f, 0.0f, 1.0f}; - static const struct vec2 ccw_quad[] = + static const struct vec3 ccw_quad[] = { - {-1.0f, -1.0f}, - { 1.0f, -1.0f}, - {-1.0f, 1.0f}, - { 1.0f, 1.0f}, + {-1.0f, -1.0f, 0.0f}, + { 1.0f, -1.0f, 0.0f}, + {-1.0f, 1.0f, 0.0f}, + { 1.0f, 1.0f, 0.0f}, }; if (!init_test_context(&test_context, NULL)) @@ -22134,6 +22135,285 @@ static void test_gather_c(void) release_test_context(&test_context); } +static void test_depth_bias(void) +{ + struct vec3 vertices[] = + { + {-1.0f, -1.0f, 0.5f}, + {-1.0f, 1.0f, 0.5f}, + { 1.0f, -1.0f, 0.5f}, + { 1.0f, 1.0f, 0.5f}, + }; + struct d3d11_test_context test_context; + D3D11_RASTERIZER_DESC rasterizer_desc; + D3D11_TEXTURE2D_DESC texture_desc; + double m, r, bias, depth, data; + ID3D11DeviceContext *context; + struct resource_readback rb; + ID3D11DepthStencilView *dsv; + unsigned int expected_value; + ID3D11RasterizerState *rs; + ID3D11Texture2D *texture; + float depth_values[480]; + unsigned int format_idx; + unsigned int x, y, i, j; + unsigned int shift = 0; + ID3D11Device *device; + DXGI_FORMAT format; + const UINT32 *u32; + const UINT16 *u16; + UINT32 u32_value; + HRESULT hr; + + static const struct + { + float z; + float exponent; + } + quads[] = + { + {0.125f, -3.0f}, + {0.250f, -2.0f}, + {0.500f, -1.0f}, + {1.000f, 0.0f}, + }; + static const int bias_tests[] = + { + -10000, -1000, -100, -10, -9, -8, -7, -6, -5, -4, -3, -2, -1, + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 50, 100, 200, 500, 1000, 10000, + }; + static const float quad_slopes[] = + { + 0.0f, 0.5f, 1.0f + }; + static const float slope_scaled_bias_tests[] = + { + 0.0f, 0.5f, 1.0f, 2.0f, 128.0f, 1000.0f, 10000.0f, + }; + static const DXGI_FORMAT formats[] = + { + DXGI_FORMAT_D32_FLOAT, + DXGI_FORMAT_D24_UNORM_S8_UINT, + DXGI_FORMAT_D16_UNORM, + }; + + if (!init_test_context(&test_context, NULL)) + return; + + device = test_context.device; + context = test_context.immediate_context; + + memset(&rasterizer_desc, 0, sizeof(rasterizer_desc)); + rasterizer_desc.FillMode = D3D11_FILL_SOLID; + rasterizer_desc.CullMode = D3D11_CULL_NONE; + rasterizer_desc.FrontCounterClockwise = FALSE; + rasterizer_desc.DepthBias = 0; + rasterizer_desc.DepthBiasClamp = 0.0f; + rasterizer_desc.SlopeScaledDepthBias = 0.0f; + rasterizer_desc.DepthClipEnable = TRUE; + + for (format_idx = 0; format_idx < ARRAY_SIZE(formats); ++format_idx) + { + format = formats[format_idx]; + + ID3D11Texture2D_GetDesc(test_context.backbuffer, &texture_desc); + texture_desc.Format = format; + texture_desc.BindFlags = D3D11_BIND_DEPTH_STENCIL; + hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = ID3D11Device_CreateDepthStencilView(device, (ID3D11Resource *)texture, NULL, &dsv); + ok(SUCCEEDED(hr), "Failed to create render depth stencil view, hr %#x.\n", hr); + ID3D11DeviceContext_OMSetRenderTargets(context, 1, &test_context.backbuffer_rtv, dsv); + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH | D3D11_CLEAR_STENCIL, 1.0f, 0); + draw_quad(&test_context); + switch (format) + { + case DXGI_FORMAT_D32_FLOAT: + check_texture_float(texture, 0.0f, 0); + break; + case DXGI_FORMAT_D24_UNORM_S8_UINT: + /* FIXME: Depth/stencil byte order is reversed in wined3d. */ + shift = get_texture_color(texture, 0, 0) == 0xffffff ? 0 : 8; + todo_wine + check_texture_color(texture, 0xffffff, 1); + break; + case DXGI_FORMAT_D16_UNORM: + get_texture_readback(texture, 0, &rb); + for (y = 0; y < texture_desc.Height; ++y) + { + for (x = 0; x < texture_desc.Width; ++x) + { + u16 = get_readback_data(&rb, x, y, sizeof(*u16)); + ok(*u16 == 0xffff, "Got unexpected value %#x.\n", *u16); + } + } + release_resource_readback(&rb); + break; + default: + trace("Unhandled format %#x.\n", format); + break; + } + + /* DepthBias */ + for (i = 0; i < ARRAY_SIZE(quads); ++i) + { + for (j = 0; j < ARRAY_SIZE(vertices); ++j) + vertices[j].z = quads[i].z; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)test_context.vb, + 0, NULL, vertices, 0, 0); + + for (j = 0; j < ARRAY_SIZE(bias_tests); ++j) + { + rasterizer_desc.DepthBias = bias_tests[j]; + ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ID3D11DeviceContext_RSSetState(context, rs); + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + draw_quad(&test_context); + switch (format) + { + case DXGI_FORMAT_D32_FLOAT: + bias = rasterizer_desc.DepthBias * pow(2.0f, quads[i].exponent - 23.0f); + depth = min(max(0.0f, quads[i].z + bias), 1.0f); + + check_texture_float(texture, depth, 2); + break; + case DXGI_FORMAT_D24_UNORM_S8_UINT: + r = 1.0f / 16777215.0f; + bias = rasterizer_desc.DepthBias * r; + depth = min(max(0.0f, quads[i].z + bias), 1.0f); + + get_texture_readback(texture, 0, &rb); + for (y = 0; y < texture_desc.Height; ++y) + { + expected_value = depth * 16777215.0f + 0.5f; + for (x = 0; x < texture_desc.Width; ++x) + { + u32 = get_readback_data(&rb, x, y, sizeof(*u32)); + u32_value = *u32 >> shift; + ok(abs(u32_value - expected_value) <= 1, + "Got value %#x (%.8e), expected %#x (%.8e).\n", + u32_value, u32_value / 16777215.0f, + expected_value, expected_value / 16777215.0f); + } + } + release_resource_readback(&rb); + break; + case DXGI_FORMAT_D16_UNORM: + r = 1.0f / 65535.0f; + bias = rasterizer_desc.DepthBias * r; + depth = min(max(0.0f, quads[i].z + bias), 1.0f); + + get_texture_readback(texture, 0, &rb); + for (y = 0; y < texture_desc.Height; ++y) + { + expected_value = depth * 65535.0f + 0.5f; + for (x = 0; x < texture_desc.Width; ++x) + { + u16 = get_readback_data(&rb, x, y, sizeof(*u16)); + ok(abs(*u16 - expected_value) <= 1, + "Got value %#x (%.8e), expected %#x (%.8e).\n", + *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); + } + } + release_resource_readback(&rb); + break; + default: + break; + } + ID3D11RasterizerState_Release(rs); + } + } + + /* SlopeScaledDepthBias */ + rasterizer_desc.DepthBias = 0; + for (i = 0; i < ARRAY_SIZE(quad_slopes); ++i) + { + for (j = 0; j < ARRAY_SIZE(vertices); ++j) + vertices[j].z = j == 1 || j == 3 ? 0.0f : quad_slopes[i]; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)test_context.vb, + 0, NULL, vertices, 0, 0); + + ID3D11DeviceContext_RSSetState(context, NULL); + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + draw_quad(&test_context); + get_texture_readback(texture, 0, &rb); + for (y = 0; y < texture_desc.Height; ++y) + { + switch (format) + { + case DXGI_FORMAT_D32_FLOAT: + depth_values[y] = get_readback_float(&rb, 0, y); + break; + case DXGI_FORMAT_D24_UNORM_S8_UINT: + u32 = get_readback_data(&rb, 0, y, sizeof(*u32)); + u32_value = *u32 >> shift; + depth_values[y] = u32_value / 16777215.0f; + break; + case DXGI_FORMAT_D16_UNORM: + u16 = get_readback_data(&rb, 0, y, sizeof(*u16)); + depth_values[y] = *u16 / 65535.0f; + break; + default: + break; + } + } + release_resource_readback(&rb); + + for (j = 0; j < ARRAY_SIZE(slope_scaled_bias_tests); ++j) + { + rasterizer_desc.SlopeScaledDepthBias = slope_scaled_bias_tests[j]; + ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rs); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ID3D11DeviceContext_RSSetState(context, rs); + ID3D11DeviceContext_ClearDepthStencilView(context, dsv, D3D11_CLEAR_DEPTH, 1.0f, 0); + draw_quad(&test_context); + + m = quad_slopes[i] / texture_desc.Height; + bias = rasterizer_desc.SlopeScaledDepthBias * m; + get_texture_readback(texture, 0, &rb); + for (y = 0; y < texture_desc.Height; ++y) + { + depth = min(max(0.0f, depth_values[y] + bias), 1.0f); + switch (format) + { + case DXGI_FORMAT_D32_FLOAT: + data = get_readback_float(&rb, 0, y); + ok(compare_float(data, depth, 140), + "Got depth %.8e, expected %.8e.\n", data, depth); + break; + case DXGI_FORMAT_D24_UNORM_S8_UINT: + u32 = get_readback_data(&rb, 0, y, sizeof(*u32)); + u32_value = *u32 >> shift; + expected_value = depth * 16777215.0f + 0.5f; + ok(abs(u32_value - expected_value) <= 3, + "Got value %#x (%.8e), expected %#x (%.8e).\n", + u32_value, u32_value / 16777215.0f, + expected_value, expected_value / 16777215.0f); + break; + case DXGI_FORMAT_D16_UNORM: + u16 = get_readback_data(&rb, 0, y, sizeof(*u16)); + expected_value = depth * 65535.0f + 0.5f; + ok(abs(*u16 - expected_value) <= 1, + "Got value %#x (%.8e), expected %#x (%.8e).\n", + *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); + break; + default: + break; + } + } + release_resource_readback(&rb); + ID3D11RasterizerState_Release(rs); + } + } + + ID3D11Texture2D_Release(texture); + ID3D11DepthStencilView_Release(dsv); + } + + release_test_context(&test_context); +} + static void test_fractional_viewports(void) { struct d3d11_test_context test_context; @@ -23591,6 +23871,7 @@ START_TEST(d3d11) test_stream_output_components(); test_gather(); test_gather_c(); + test_depth_bias(); test_fractional_viewports(); test_early_depth_stencil(); test_conservative_depth_output(); -- 2.13.6

2 3

[PATCH 01/11] d3dx9: Merge "main" source files.
by Matteo Bruni 08 Dec '17

08 Dec '17

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_24/Makefile.in | 3 +- dlls/d3dx9_24/d3dx9_24_main.c | 60 ------------------------ dlls/d3dx9_25/Makefile.in | 3 +- dlls/d3dx9_25/d3dx9_25_main.c | 60 ------------------------ dlls/d3dx9_26/Makefile.in | 3 +- dlls/d3dx9_26/d3dx9_26_main.c | 60 ------------------------ dlls/d3dx9_27/Makefile.in | 3 +- dlls/d3dx9_27/d3dx9_27_main.c | 60 ------------------------ dlls/d3dx9_28/Makefile.in | 3 +- dlls/d3dx9_28/d3dx9_28_main.c | 60 ------------------------ dlls/d3dx9_29/Makefile.in | 3 +- dlls/d3dx9_29/d3dx9_29_main.c | 60 ------------------------ dlls/d3dx9_30/Makefile.in | 3 +- dlls/d3dx9_30/d3dx9_30_main.c | 77 ------------------------------- dlls/d3dx9_31/Makefile.in | 3 +- dlls/d3dx9_31/d3dx9_31_main.c | 60 ------------------------ dlls/d3dx9_32/Makefile.in | 3 +- dlls/d3dx9_32/d3dx9_32_main.c | 61 ------------------------ dlls/d3dx9_33/Makefile.in | 3 +- dlls/d3dx9_33/d3dx9_33_main.c | 62 ------------------------- dlls/d3dx9_34/Makefile.in | 3 +- dlls/d3dx9_34/d3dx9_34_main.c | 60 ------------------------ dlls/d3dx9_35/Makefile.in | 3 +- dlls/d3dx9_35/d3dx9_35_main.c | 60 ------------------------ dlls/d3dx9_36/Makefile.in | 4 +- dlls/d3dx9_36/{d3dx9_36_main.c => main.c} | 22 ++++----- dlls/d3dx9_37/Makefile.in | 3 +- dlls/d3dx9_37/d3dx9_37_main.c | 60 ------------------------ dlls/d3dx9_38/Makefile.in | 3 +- dlls/d3dx9_38/d3dx9_38_main.c | 60 ------------------------ dlls/d3dx9_39/Makefile.in | 3 +- dlls/d3dx9_39/d3dx9_39_main.c | 60 ------------------------ dlls/d3dx9_40/Makefile.in | 3 +- dlls/d3dx9_40/d3dx9_40_main.c | 61 ------------------------ dlls/d3dx9_41/Makefile.in | 3 +- dlls/d3dx9_41/d3dx9_41_main.c | 61 ------------------------ dlls/d3dx9_42/Makefile.in | 3 +- dlls/d3dx9_42/d3dx9_42_main.c | 62 ------------------------- dlls/d3dx9_43/Makefile.in | 3 +- dlls/d3dx9_43/d3dx9_43_main.c | 61 ------------------------ include/d3dx9core.h | 4 +- 41 files changed, 52 insertions(+), 1200 deletions(-) delete mode 100644 dlls/d3dx9_24/d3dx9_24_main.c delete mode 100644 dlls/d3dx9_25/d3dx9_25_main.c delete mode 100644 dlls/d3dx9_26/d3dx9_26_main.c delete mode 100644 dlls/d3dx9_27/d3dx9_27_main.c delete mode 100644 dlls/d3dx9_28/d3dx9_28_main.c delete mode 100644 dlls/d3dx9_29/d3dx9_29_main.c delete mode 100644 dlls/d3dx9_30/d3dx9_30_main.c delete mode 100644 dlls/d3dx9_31/d3dx9_31_main.c delete mode 100644 dlls/d3dx9_32/d3dx9_32_main.c delete mode 100644 dlls/d3dx9_33/d3dx9_33_main.c delete mode 100644 dlls/d3dx9_34/d3dx9_34_main.c delete mode 100644 dlls/d3dx9_35/d3dx9_35_main.c rename dlls/d3dx9_36/{d3dx9_36_main.c => main.c} (73%) delete mode 100644 dlls/d3dx9_37/d3dx9_37_main.c delete mode 100644 dlls/d3dx9_38/d3dx9_38_main.c delete mode 100644 dlls/d3dx9_39/d3dx9_39_main.c delete mode 100644 dlls/d3dx9_40/d3dx9_40_main.c delete mode 100644 dlls/d3dx9_41/d3dx9_41_main.c delete mode 100644 dlls/d3dx9_42/d3dx9_42_main.c delete mode 100644 dlls/d3dx9_43/d3dx9_43_main.c diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in index 71dee7f7740..bd8d3a1df52 100644 --- a/dlls/d3dx9_24/Makefile.in +++ b/dlls/d3dx9_24/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=24 MODULE = d3dx9_24.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_24_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_24/d3dx9_24_main.c b/dlls/d3dx9_24/d3dx9_24_main.c deleted file mode 100644 index 613061675a0..00000000000 --- a/dlls/d3dx9_24/d3dx9_24_main.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==24) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in index 9b44be8567d..17871f386fd 100644 --- a/dlls/d3dx9_25/Makefile.in +++ b/dlls/d3dx9_25/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=25 MODULE = d3dx9_25.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_25_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_25/d3dx9_25_main.c b/dlls/d3dx9_25/d3dx9_25_main.c deleted file mode 100644 index ae4591772d6..00000000000 --- a/dlls/d3dx9_25/d3dx9_25_main.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==25) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in index 14a52d1a574..6a16016473d 100644 --- a/dlls/d3dx9_26/Makefile.in +++ b/dlls/d3dx9_26/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=26 MODULE = d3dx9_26.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_26_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_26/d3dx9_26_main.c b/dlls/d3dx9_26/d3dx9_26_main.c deleted file mode 100644 index 08b48d94cbd..00000000000 --- a/dlls/d3dx9_26/d3dx9_26_main.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==26) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in index b2784fc619d..b3def98d6eb 100644 --- a/dlls/d3dx9_27/Makefile.in +++ b/dlls/d3dx9_27/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=27 MODULE = d3dx9_27.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_27_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_27/d3dx9_27_main.c b/dlls/d3dx9_27/d3dx9_27_main.c deleted file mode 100644 index c418071f6b4..00000000000 --- a/dlls/d3dx9_27/d3dx9_27_main.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==27) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in index f6b31d658a9..c4542135e66 100644 --- a/dlls/d3dx9_28/Makefile.in +++ b/dlls/d3dx9_28/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=28 MODULE = d3dx9_28.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_28_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_28/d3dx9_28_main.c b/dlls/d3dx9_28/d3dx9_28_main.c deleted file mode 100644 index c8292d8a15c..00000000000 --- a/dlls/d3dx9_28/d3dx9_28_main.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==28) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in index 9bd84beeaaf..e1b50d0e2a4 100644 --- a/dlls/d3dx9_29/Makefile.in +++ b/dlls/d3dx9_29/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=29 MODULE = d3dx9_29.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_29_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_29/d3dx9_29_main.c b/dlls/d3dx9_29/d3dx9_29_main.c deleted file mode 100644 index 6a1174c59d4..00000000000 --- a/dlls/d3dx9_29/d3dx9_29_main.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==29) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in index a8ee15d46f6..6f18d145210 100644 --- a/dlls/d3dx9_30/Makefile.in +++ b/dlls/d3dx9_30/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=30 MODULE = d3dx9_30.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_30_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_30/d3dx9_30_main.c b/dlls/d3dx9_30/d3dx9_30_main.c deleted file mode 100644 index dba15fe752b..00000000000 --- a/dlls/d3dx9_30/d3dx9_30_main.c +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(d3dx); - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==30) - return TRUE; - else - return FALSE; -} - -typedef enum _D3DX_CPU_OPTIMIZATION -{ - D3DX_NOT_OPTIMIZED = 0, - D3DX_3DNOW_OPTIMIZED = 1, - D3DX_SSE2_OPTIMIZED = 2, - D3DX_SSE_OPTIMIZED = 3 -} D3DX_CPU_OPTIMIZATION; - -D3DX_CPU_OPTIMIZATION WINAPI D3DXCpuOptimizations(BOOL enable) -{ - FIXME("%i - stub\n", enable); - return D3DX_NOT_OPTIMIZED; -} diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in index 27bd337df11..be5cdb9878f 100644 --- a/dlls/d3dx9_31/Makefile.in +++ b/dlls/d3dx9_31/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=31 MODULE = d3dx9_31.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_31_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_31/d3dx9_31_main.c b/dlls/d3dx9_31/d3dx9_31_main.c deleted file mode 100644 index 47dc3044c9e..00000000000 --- a/dlls/d3dx9_31/d3dx9_31_main.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==31) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in index 1229c7fe9bf..6373c821e8a 100644 --- a/dlls/d3dx9_32/Makefile.in +++ b/dlls/d3dx9_32/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=32 MODULE = d3dx9_32.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_32_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_32/d3dx9_32_main.c b/dlls/d3dx9_32/d3dx9_32_main.c deleted file mode 100644 index 414baa37135..00000000000 --- a/dlls/d3dx9_32/d3dx9_32_main.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==32) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in index 44bd9917713..10d0dd3ba28 100644 --- a/dlls/d3dx9_33/Makefile.in +++ b/dlls/d3dx9_33/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=33 MODULE = d3dx9_33.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_33_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_33/d3dx9_33_main.c b/dlls/d3dx9_33/d3dx9_33_main.c deleted file mode 100644 index 3e409e329fc..00000000000 --- a/dlls/d3dx9_33/d3dx9_33_main.c +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==33) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in index 4ba14c22cbb..4f592bc3e79 100644 --- a/dlls/d3dx9_34/Makefile.in +++ b/dlls/d3dx9_34/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=34 MODULE = d3dx9_34.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_34_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_34/d3dx9_34_main.c b/dlls/d3dx9_34/d3dx9_34_main.c deleted file mode 100644 index 17115f23eff..00000000000 --- a/dlls/d3dx9_34/d3dx9_34_main.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==34) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in index ee527d55e49..8ae7a9bb1b8 100644 --- a/dlls/d3dx9_35/Makefile.in +++ b/dlls/d3dx9_35/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=35 MODULE = d3dx9_35.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_35_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_35/d3dx9_35_main.c b/dlls/d3dx9_35/d3dx9_35_main.c deleted file mode 100644 index bf0fd756dd3..00000000000 --- a/dlls/d3dx9_35/d3dx9_35_main.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==35) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 83f7d1c61b7..dec7f32472b 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -1,3 +1,5 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=36 +EXTRADEFS = -DD3DX_SDK_VERSION=36 MODULE = d3dx9_36.dll IMPORTLIB = d3dx9 IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 @@ -5,7 +7,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 C_SRCS = \ animation.c \ core.c \ - d3dx9_36_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_36/d3dx9_36_main.c b/dlls/d3dx9_36/main.c similarity index 73% rename from dlls/d3dx9_36/d3dx9_36_main.c rename to dlls/d3dx9_36/main.c index 599b76a62e8..a256d425266 100644 --- a/dlls/d3dx9_36/d3dx9_36_main.c +++ b/dlls/d3dx9_36/main.c @@ -26,9 +26,8 @@ #include "initguid.h" #include "d3dx9_private.h" -/*********************************************************************** - * DllMain. - */ +WINE_DEFAULT_DEBUG_CHANNEL(d3dx); + BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) { switch(reason) @@ -42,14 +41,13 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) return TRUE; } -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) +BOOL WINAPI D3DXCheckVersion(UINT d3d_sdk_ver, UINT d3dx_sdk_ver) +{ + return d3d_sdk_ver == D3D_SDK_VERSION && d3dx_sdk_ver == D3DX_SDK_VERSION; +} + +DWORD WINAPI D3DXCpuOptimizations(BOOL enable) { - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==36) - return TRUE; - else - return FALSE; + FIXME("%#x - stub\n", enable); + return 0; } diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in index 61528a337e8..6b33e2e5096 100644 --- a/dlls/d3dx9_37/Makefile.in +++ b/dlls/d3dx9_37/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=37 MODULE = d3dx9_37.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_37_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_37/d3dx9_37_main.c b/dlls/d3dx9_37/d3dx9_37_main.c deleted file mode 100644 index bbe8e7313eb..00000000000 --- a/dlls/d3dx9_37/d3dx9_37_main.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==37) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in index cb1507c00f0..420f93e5164 100644 --- a/dlls/d3dx9_38/Makefile.in +++ b/dlls/d3dx9_38/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=38 MODULE = d3dx9_38.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_38_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_38/d3dx9_38_main.c b/dlls/d3dx9_38/d3dx9_38_main.c deleted file mode 100644 index 304a7ee7217..00000000000 --- a/dlls/d3dx9_38/d3dx9_38_main.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==38) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in index e372816ac48..faba12ec7d2 100644 --- a/dlls/d3dx9_39/Makefile.in +++ b/dlls/d3dx9_39/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=39 MODULE = d3dx9_39.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_39_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_39/d3dx9_39_main.c b/dlls/d3dx9_39/d3dx9_39_main.c deleted file mode 100644 index 892ccf36278..00000000000 --- a/dlls/d3dx9_39/d3dx9_39_main.c +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==39) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in index b6c4dcdf0f7..2d6ac814c59 100644 --- a/dlls/d3dx9_40/Makefile.in +++ b/dlls/d3dx9_40/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=40 MODULE = d3dx9_40.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_40_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_40/d3dx9_40_main.c b/dlls/d3dx9_40/d3dx9_40_main.c deleted file mode 100644 index 6c9cc45b95d..00000000000 --- a/dlls/d3dx9_40/d3dx9_40_main.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * Copyright (C) 2009 Rico Schüller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==40) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in index 9aa91a9bac7..fbabfcb289b 100644 --- a/dlls/d3dx9_41/Makefile.in +++ b/dlls/d3dx9_41/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=41 MODULE = d3dx9_41.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_41_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_41/d3dx9_41_main.c b/dlls/d3dx9_41/d3dx9_41_main.c deleted file mode 100644 index f37cee7f47f..00000000000 --- a/dlls/d3dx9_41/d3dx9_41_main.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * Copyright (C) 2009 Rico Schüller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==41) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in index a5cc60e556f..c60062b61bf 100644 --- a/dlls/d3dx9_42/Makefile.in +++ b/dlls/d3dx9_42/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=42 MODULE = d3dx9_42.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_42_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_42/d3dx9_42_main.c b/dlls/d3dx9_42/d3dx9_42_main.c deleted file mode 100644 index 631bd3bf407..00000000000 --- a/dlls/d3dx9_42/d3dx9_42_main.c +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * Copyright (C) 2009 Rico Schüller - * Copyright (C) 2009 Ričardas Barkauskas - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==42) - return TRUE; - else - return FALSE; -} diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in index cb787075690..89610de9e56 100644 --- a/dlls/d3dx9_43/Makefile.in +++ b/dlls/d3dx9_43/Makefile.in @@ -1,3 +1,4 @@ +EXTRADEFS = -DD3DX_SDK_VERSION=43 MODULE = d3dx9_43.dll IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 @@ -5,7 +6,7 @@ PARENTSRC = ../d3dx9_36 C_SRCS = \ animation.c \ core.c \ - d3dx9_43_main.c \ + main.c \ effect.c \ font.c \ line.c \ diff --git a/dlls/d3dx9_43/d3dx9_43_main.c b/dlls/d3dx9_43/d3dx9_43_main.c deleted file mode 100644 index b4a5e2b655f..00000000000 --- a/dlls/d3dx9_43/d3dx9_43_main.c +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Direct3D X 9 main file - * - * Copyright (C) 2007 David Adam - * Copyright (C) 2009 Rico Schüller - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" -#include "initguid.h" -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" - -#include "d3dx9.h" - -/*********************************************************************** - * DllMain. - */ -BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, LPVOID reserved) -{ - switch(reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(inst); - break; - } - return TRUE; -} - -/*********************************************************************** - * D3DXCheckVersion - * Checks whether we are compiling against the correct d3d and d3dx library. - */ -BOOL WINAPI D3DXCheckVersion(UINT d3dsdkvers, UINT d3dxsdkvers) -{ - if(d3dsdkvers==D3D_SDK_VERSION && d3dxsdkvers==43) - return TRUE; - else - return FALSE; -} diff --git a/include/d3dx9core.h b/include/d3dx9core.h index a04bced0227..e66afc4b832 100644 --- a/include/d3dx9core.h +++ b/include/d3dx9core.h @@ -24,11 +24,9 @@ /********************************************** ***************** Definitions **************** **********************************************/ -/* D3DX_VERSION will be completely ignored since we are - implementing all dlls from d3dx9_24 to d3dx9_36 */ #define D3DX_VERSION 0x0902 #ifndef D3DX_SDK_VERSION -#define D3DX_SDK_VERSION 36 +#define D3DX_SDK_VERSION 43 #endif #define D3DXSPRITE_DONOTSAVESTATE 0x00000001 #define D3DXSPRITE_DONOTMODIFY_RENDERSTATE 0x00000002 -- 2.13.6

3 15

[PATCH 5/5] webservices: Don't use the dictionary for UTF-16 text.
by Hans Leidekker 08 Dec '17

08 Dec '17

Although UTF-16 text is converted to UTF-8 before transmission it's stored inline rather than in the dictionary. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/reader.c | 12 + dlls/webservices/webservices_private.h | 1 + dlls/webservices/writer.c | 1411 +++++++++++++++++--------------- 3 files changed, 754 insertions(+), 670 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 9d024a3446..a05b1edb33 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -788,6 +788,18 @@ WS_XML_UTF8_TEXT *alloc_utf8_text( const BYTE *data, ULONG len ) return ret; } +WS_XML_UTF16_TEXT *alloc_utf16_text( const BYTE *data, ULONG len ) +{ + WS_XML_UTF16_TEXT *ret; + + if (!(ret = heap_alloc( sizeof(*ret) + len ))) return NULL; + ret->text.textType = WS_XML_TEXT_TYPE_UTF16; + ret->byteCount = len; + ret->bytes = len ? (BYTE *)(ret + 1) : NULL; + if (data) memcpy( ret->bytes, data, len ); + return ret; +} + WS_XML_BASE64_TEXT *alloc_base64_text( const BYTE *data, ULONG len ) { WS_XML_BASE64_TEXT *ret; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index f8cc6d9cfe..e477e0fc3f 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -68,6 +68,7 @@ HRESULT read_header( WS_XML_READER *, const WS_XML_STRING *, const WS_XML_STRING HRESULT create_header_buffer( WS_XML_READER *, WS_HEAP *, WS_XML_BUFFER ** ) DECLSPEC_HIDDEN; WS_XML_UTF8_TEXT *alloc_utf8_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; +WS_XML_UTF16_TEXT *alloc_utf16_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; WS_XML_BASE64_TEXT *alloc_base64_text( const BYTE *, ULONG ) DECLSPEC_HIDDEN; WS_XML_BOOL_TEXT *alloc_bool_text( BOOL ) DECLSPEC_HIDDEN; WS_XML_INT32_TEXT *alloc_int32_text( INT32 ) DECLSPEC_HIDDEN; diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 4b2466390c..be2994af83 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -667,6 +667,15 @@ static enum record_type get_attr_text_record_type( const WS_XML_TEXT *text, BOOL if (text_utf8->value.length <= MAX_UINT16) return RECORD_CHARS16_TEXT; return RECORD_CHARS32_TEXT; } + case WS_XML_TEXT_TYPE_UTF16: + { + const WS_XML_UTF16_TEXT *text_utf16 = (const WS_XML_UTF16_TEXT *)text; + int len = text_utf16->byteCount / sizeof(WCHAR); + int len_utf8 = WideCharToMultiByte( CP_UTF8, 0, (const WCHAR *)text_utf16->bytes, len, NULL, 0, NULL, NULL ); + if (len_utf8 <= MAX_UINT8) return RECORD_CHARS8_TEXT; + if (len_utf8 <= MAX_UINT16) return RECORD_CHARS16_TEXT; + return RECORD_CHARS32_TEXT; + } case WS_XML_TEXT_TYPE_BASE64: { const WS_XML_BASE64_TEXT *text_base64 = (const WS_XML_BASE64_TEXT *)text; @@ -784,153 +793,566 @@ static BOOL get_string_id( struct writer *writer, const WS_XML_STRING *str, ULON return FALSE; } -static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TEXT *text ) +static ULONG format_bool( const BOOL *ptr, unsigned char *buf ) { - enum record_type type; - BOOL use_dict = FALSE; - HRESULT hr; - ULONG id; - - if (text && text->textType == WS_XML_TEXT_TYPE_UTF8) + static const unsigned char bool_true[] = {'t','r','u','e'}, bool_false[] = {'f','a','l','s','e'}; + if (*ptr) { - const WS_XML_UTF8_TEXT *utf8 = (const WS_XML_UTF8_TEXT *)text; - use_dict = get_string_id( writer, &utf8->value, &id ); + memcpy( buf, bool_true, sizeof(bool_true) ); + return sizeof(bool_true); } - type = get_attr_text_record_type( text, use_dict ); + memcpy( buf, bool_false, sizeof(bool_false) ); + return sizeof(bool_false); +} - if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; - write_char( writer, type ); +static ULONG format_int32( const INT32 *ptr, unsigned char *buf ) +{ + return wsprintfA( (char *)buf, "%d", *ptr ); +} - switch (type) +static ULONG format_int64( const INT64 *ptr, unsigned char *buf ) +{ + return wsprintfA( (char *)buf, "%I64d", *ptr ); +} + +static ULONG format_uint64( const UINT64 *ptr, unsigned char *buf ) +{ + return wsprintfA( (char *)buf, "%I64u", *ptr ); +} + +static ULONG format_double( const double *ptr, unsigned char *buf ) +{ +#ifdef HAVE_POWL + static const long double precision = 0.0000000000000001; + unsigned char *p = buf; + long double val = *ptr; + int neg, mag, mag2, use_exp; + + if (isnan( val )) { - case RECORD_CHARS8_TEXT: + memcpy( buf, "NaN", 3 ); + return 3; + } + if (isinf( val )) { - WS_XML_UTF8_TEXT *text_utf8 = (WS_XML_UTF8_TEXT *)text; - if (!text_utf8) + if (val < 0) { - if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; - write_char( writer, 0 ); - return S_OK; + memcpy( buf, "-INF", 4 ); + return 4; } - if ((hr = write_grow_buffer( writer, 1 + text_utf8->value.length )) != S_OK) return hr; - write_char( writer, text_utf8->value.length ); - write_bytes( writer, text_utf8->value.bytes, text_utf8->value.length ); - return S_OK; + memcpy( buf, "INF", 3 ); + return 3; } - case RECORD_CHARS16_TEXT: + if (val == 0.0) { - WS_XML_UTF8_TEXT *text_utf8 = (WS_XML_UTF8_TEXT *)text; - UINT16 len = text_utf8->value.length; - if ((hr = write_grow_buffer( writer, sizeof(len) + len )) != S_OK) return hr; - write_bytes( writer, (const BYTE *)&len, sizeof(len) ); - write_bytes( writer, text_utf8->value.bytes, len ); - return S_OK; + *p = '0'; + return 1; } - case RECORD_BYTES8_TEXT: + + if ((neg = val < 0)) { - WS_XML_BASE64_TEXT *text_base64 = (WS_XML_BASE64_TEXT *)text; - if ((hr = write_grow_buffer( writer, 1 + text_base64->length )) != S_OK) return hr; - write_char( writer, text_base64->length ); - write_bytes( writer, text_base64->bytes, text_base64->length ); - return S_OK; + *p++ = '-'; + val = -val; } - case RECORD_BYTES16_TEXT: + + mag = log10l( val ); + use_exp = (mag >= 15 || (neg && mag >= 1) || mag <= -1); + if (use_exp) { - WS_XML_BASE64_TEXT *text_base64 = (WS_XML_BASE64_TEXT *)text; - UINT16 len = text_base64->length; - if ((hr = write_grow_buffer( writer, sizeof(len) + len )) != S_OK) return hr; - write_bytes( writer, (const BYTE *)&len, sizeof(len) ); - write_bytes( writer, text_base64->bytes, len ); - return S_OK; + if (mag < 0) mag -= 1; + val = val / powl( 10.0, mag ); + mag2 = mag; + mag = 0; } - case RECORD_ZERO_TEXT: - case RECORD_ONE_TEXT: - case RECORD_FALSE_TEXT: - case RECORD_TRUE_TEXT: - return S_OK; + else if (mag < 1) mag = 0; - case RECORD_INT8_TEXT: + while (val > precision || mag >= 0) { - INT8 val = get_text_value_int( text ); - if ((hr = write_grow_buffer( writer, sizeof(val) )) != S_OK) return hr; - write_char( writer, val ); - return S_OK; + long double weight = powl( 10.0, mag ); + if (weight > 0 && !isinf( weight )) + { + int digit = floorl( val / weight ); + val -= digit * weight; + *(p++) = '0' + digit; + } + if (!mag && val > precision) *(p++) = '.'; + mag--; } - case RECORD_INT16_TEXT: + + if (use_exp) { - INT16 val = get_text_value_int( text ); - if ((hr = write_grow_buffer( writer, sizeof(val) )) != S_OK) return hr; - write_bytes( writer, (const BYTE *)&val, sizeof(val) ); - return S_OK; + int i, j; + *(p++) = 'E'; + if (mag2 > 0) *(p++) = '+'; + else + { + *(p++) = '-'; + mag2 = -mag2; + } + mag = 0; + while (mag2 > 0) + { + *(p++) = '0' + mag2 % 10; + mag2 /= 10; + mag++; + } + for (i = -mag, j = -1; i < j; i++, j--) + { + p[i] ^= p[j]; + p[j] ^= p[i]; + p[i] ^= p[j]; + } } - case RECORD_INT32_TEXT: + + return p - buf; +#else + FIXME( "powl not found at build time\n" ); + return 0; +#endif +} + +static inline int year_size( int year ) +{ + return leap_year( year ) ? 366 : 365; +} + +#define TZ_OFFSET 8 +static ULONG format_datetime( const WS_DATETIME *ptr, unsigned char *buf ) +{ + static const char fmt[] = "%04u-%02u-%02uT%02u:%02u:%02u"; + int day, hour, min, sec, sec_frac, month = 0, year = 1, tz_hour; + unsigned __int64 ticks, day_ticks; + ULONG len; + + if (ptr->format == WS_DATETIME_FORMAT_LOCAL && + ptr->ticks >= TICKS_1601_01_01 + TZ_OFFSET * TICKS_PER_HOUR) { - INT32 val = get_text_value_int( text ); - if ((hr = write_grow_buffer( writer, sizeof(val) )) != S_OK) return hr; - write_bytes( writer, (const BYTE *)&val, sizeof(val) ); - return S_OK; + ticks = ptr->ticks - TZ_OFFSET * TICKS_PER_HOUR; + tz_hour = TZ_OFFSET; } - case RECORD_INT64_TEXT: + else { - INT64 val = get_text_value_int( text ); - if ((hr = write_grow_buffer( writer, sizeof(val) )) != S_OK) return hr; - write_bytes( writer, (const BYTE *)&val, sizeof(val) ); - return S_OK; + ticks = ptr->ticks; + tz_hour = 0; } - case RECORD_UINT64_TEXT: + day = ticks / TICKS_PER_DAY; + day_ticks = ticks % TICKS_PER_DAY; + hour = day_ticks / TICKS_PER_HOUR; + min = (day_ticks % TICKS_PER_HOUR) / TICKS_PER_MIN; + sec = (day_ticks % TICKS_PER_MIN) / TICKS_PER_SEC; + sec_frac = day_ticks % TICKS_PER_SEC; + + while (day >= year_size( year )) { - WS_XML_UINT64_TEXT *text_uint64 = (WS_XML_UINT64_TEXT *)text; - if ((hr = write_grow_buffer( writer, sizeof(text_uint64->value) )) != S_OK) return hr; - write_bytes( writer, (const BYTE *)&text_uint64->value, sizeof(text_uint64->value) ); - return S_OK; + day -= year_size( year ); + year++; } - case RECORD_DOUBLE_TEXT: + while (day >= month_days[leap_year( year )][month]) { - WS_XML_DOUBLE_TEXT *text_double = (WS_XML_DOUBLE_TEXT *)text; - if ((hr = write_grow_buffer( writer, sizeof(text_double->value) )) != S_OK) return hr; - write_bytes( writer, (const BYTE *)&text_double->value, sizeof(text_double->value) ); - return S_OK; + day -= month_days[leap_year( year )][month]; + month++; } - case RECORD_GUID_TEXT: + + len = sprintf( (char *)buf, fmt, year, month + 1, day + 1, hour, min, sec ); + if (sec_frac) { - WS_XML_GUID_TEXT *text_guid = (WS_XML_GUID_TEXT *)text; - if ((hr = write_grow_buffer( writer, sizeof(text_guid->value) )) != S_OK) return hr; - write_bytes( writer, (const BYTE *)&text_guid->value, sizeof(text_guid->value) ); - return S_OK; + static const char fmt_frac[] = ".%07u"; + len += sprintf( (char *)buf + len, fmt_frac, sec_frac ); + while (buf[len - 1] == '0') len--; } - case RECORD_UNIQUE_ID_TEXT: + if (ptr->format == WS_DATETIME_FORMAT_UTC) { - WS_XML_UNIQUE_ID_TEXT *text_unique_id = (WS_XML_UNIQUE_ID_TEXT *)text; - if ((hr = write_grow_buffer( writer, sizeof(text_unique_id->value) )) != S_OK) return hr; - write_bytes( writer, (const BYTE *)&text_unique_id->value, sizeof(text_unique_id->value) ); - return S_OK; + buf[len++] = 'Z'; } - case RECORD_DATETIME_TEXT: + else if (ptr->format == WS_DATETIME_FORMAT_LOCAL) { - WS_XML_DATETIME_TEXT *text_datetime = (WS_XML_DATETIME_TEXT *)text; - UINT64 val = text_datetime->value.ticks; + static const char fmt_tz[] = "%c%02u:00"; + len += sprintf( (char *)buf + len, fmt_tz, tz_hour ? '-' : '+', tz_hour ); + } - assert( val <= TICKS_MAX ); - if (text_datetime->value.format == WS_DATETIME_FORMAT_UTC) val |= (UINT64)1 << 62; - else if (text_datetime->value.format == WS_DATETIME_FORMAT_LOCAL) val |= (UINT64)1 << 63; + return len; +} - if ((hr = write_grow_buffer( writer, sizeof(val) )) != S_OK) return hr; - write_bytes( writer, (const BYTE *)&val, sizeof(val) ); - return S_OK; - } - default: - FIXME( "unhandled record type %02x\n", type ); - return E_NOTIMPL; - } +static ULONG format_guid( const GUID *ptr, unsigned char *buf ) +{ + static const char fmt[] = "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x"; + return sprintf( (char *)buf, fmt, ptr->Data1, ptr->Data2, ptr->Data3, + ptr->Data4[0], ptr->Data4[1], ptr->Data4[2], ptr->Data4[3], + ptr->Data4[4], ptr->Data4[5], ptr->Data4[6], ptr->Data4[7] ); } -static enum record_type get_attr_record_type( const WS_XML_ATTRIBUTE *attr, BOOL use_dict ) +static ULONG format_urn( const GUID *ptr, unsigned char *buf ) { - if (!attr->prefix || !attr->prefix->length) - { - if (use_dict) return RECORD_SHORT_DICTIONARY_ATTRIBUTE; - return RECORD_SHORT_ATTRIBUTE; - } + static const char fmt[] = "urn:uuid:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x"; + return sprintf( (char *)buf, fmt, ptr->Data1, ptr->Data2, ptr->Data3, + ptr->Data4[0], ptr->Data4[1], ptr->Data4[2], ptr->Data4[3], + ptr->Data4[4], ptr->Data4[5], ptr->Data4[6], ptr->Data4[7] ); +} + +static ULONG format_qname( const WS_XML_STRING *prefix, const WS_XML_STRING *localname, unsigned char *buf ) +{ + ULONG len = 0; + if (prefix && prefix->length) + { + memcpy( buf, prefix->bytes, prefix->length ); + len += prefix->length; + buf[len++] = ':'; + } + memcpy( buf + len, localname->bytes, localname->length ); + return len + localname->length; +} + +static ULONG encode_base64( const unsigned char *bin, ULONG len, unsigned char *buf ) +{ + static const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + ULONG i = 0, x; + + while (len > 0) + { + buf[i++] = base64[(bin[0] & 0xfc) >> 2]; + x = (bin[0] & 3) << 4; + if (len == 1) + { + buf[i++] = base64[x]; + buf[i++] = '='; + buf[i++] = '='; + break; + } + buf[i++] = base64[x | ((bin[1] & 0xf0) >> 4)]; + x = (bin[1] & 0x0f) << 2; + if (len == 2) + { + buf[i++] = base64[x]; + buf[i++] = '='; + break; + } + buf[i++] = base64[x | ((bin[2] & 0xc0) >> 6)]; + buf[i++] = base64[bin[2] & 0x3f]; + bin += 3; + len -= 3; + } + return i; +} + +static HRESULT text_to_utf8text( const WS_XML_TEXT *text, const WS_XML_UTF8_TEXT *old, ULONG *offset, + WS_XML_UTF8_TEXT **ret ) +{ + ULONG len_old = old ? old->value.length : 0; + if (offset) *offset = len_old; + + switch (text->textType) + { + case WS_XML_TEXT_TYPE_UTF8: + { + const WS_XML_UTF8_TEXT *src = (const WS_XML_UTF8_TEXT *)text; + + if (!(*ret = alloc_utf8_text( NULL, len_old + src->value.length ))) return E_OUTOFMEMORY; + if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); + memcpy( (*ret)->value.bytes + len_old, src->value.bytes, src->value.length ); + return S_OK; + } + case WS_XML_TEXT_TYPE_UTF16: + { + const WS_XML_UTF16_TEXT *src = (const WS_XML_UTF16_TEXT *)text; + const WCHAR *str = (const WCHAR *)src->bytes; + ULONG len = src->byteCount / sizeof(WCHAR), len_utf8; + + if (src->byteCount % sizeof(WCHAR)) return E_INVALIDARG; + len_utf8 = WideCharToMultiByte( CP_UTF8, 0, str, len, NULL, 0, NULL, NULL ); + if (!(*ret = alloc_utf8_text( NULL, len_old + len_utf8 ))) return E_OUTOFMEMORY; + if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); + WideCharToMultiByte( CP_UTF8, 0, str, len, (char *)(*ret)->value.bytes + len_old, len_utf8, NULL, NULL ); + return S_OK; + } + case WS_XML_TEXT_TYPE_BASE64: + { + const WS_XML_BASE64_TEXT *base64 = (const WS_XML_BASE64_TEXT *)text; + ULONG len = ((4 * base64->length / 3) + 3) & ~3; + + if (!(*ret = alloc_utf8_text( NULL, len_old + len ))) return E_OUTOFMEMORY; + if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); + (*ret)->value.length = encode_base64( base64->bytes, base64->length, (*ret)->value.bytes + len_old ) + len_old; + return S_OK; + } + case WS_XML_TEXT_TYPE_BOOL: + { + const WS_XML_BOOL_TEXT *bool_text = (const WS_XML_BOOL_TEXT *)text; + + if (!(*ret = alloc_utf8_text( NULL, len_old + 5 ))) return E_OUTOFMEMORY; + if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); + (*ret)->value.length = format_bool( &bool_text->value, (*ret)->value.bytes + len_old ) + len_old; + return S_OK; + } + case WS_XML_TEXT_TYPE_INT32: + { + const WS_XML_INT32_TEXT *int32_text = (const WS_XML_INT32_TEXT *)text; + unsigned char buf[12]; /* "-2147483648" */ + ULONG len = format_int32( &int32_text->value, buf ); + + if (!(*ret = alloc_utf8_text( NULL, len_old + len ))) return E_OUTOFMEMORY; + if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); + memcpy( (*ret)->value.bytes + len_old, buf, len ); + return S_OK; + } + case WS_XML_TEXT_TYPE_INT64: + { + const WS_XML_INT64_TEXT *int64_text = (const WS_XML_INT64_TEXT *)text; + unsigned char buf[21]; /* "-9223372036854775808" */ + ULONG len = format_int64( &int64_text->value, buf ); + + if (!(*ret = alloc_utf8_text( NULL, len_old + len ))) return E_OUTOFMEMORY; + if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); + memcpy( (*ret)->value.bytes + len_old, buf, len ); + return S_OK; + } + case WS_XML_TEXT_TYPE_UINT64: + { + const WS_XML_UINT64_TEXT *uint64_text = (const WS_XML_UINT64_TEXT *)text; + unsigned char buf[21]; /* "18446744073709551615" */ + ULONG len = format_uint64( &uint64_text->value, buf ); + + if (!(*ret = alloc_utf8_text( NULL, len_old + len ))) return E_OUTOFMEMORY; + if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); + memcpy( (*ret)->value.bytes + len_old, buf, len ); + return S_OK; + } + case WS_XML_TEXT_TYPE_DOUBLE: + { + const WS_XML_DOUBLE_TEXT *double_text = (const WS_XML_DOUBLE_TEXT *)text; + unsigned char buf[32]; /* "-1.1111111111111111E-308", oversized to address Valgrind limitations */ + unsigned short fpword; + ULONG len; + + if (!set_fpword( 0x37f, &fpword )) return E_NOTIMPL; + len = format_double( &double_text->value, buf ); + restore_fpword( fpword ); + if (!len) return E_NOTIMPL; + + if (!(*ret = alloc_utf8_text( NULL, len_old + len ))) return E_OUTOFMEMORY; + if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); + memcpy( (*ret)->value.bytes + len_old, buf, len ); + return S_OK; + } + case WS_XML_TEXT_TYPE_GUID: + { + const WS_XML_GUID_TEXT *id = (const WS_XML_GUID_TEXT *)text; + + if (!(*ret = alloc_utf8_text( NULL, len_old + 37 ))) return E_OUTOFMEMORY; + if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); + (*ret)->value.length = format_guid( &id->value, (*ret)->value.bytes + len_old ) + len_old; + return S_OK; + } + case WS_XML_TEXT_TYPE_UNIQUE_ID: + { + const WS_XML_UNIQUE_ID_TEXT *id = (const WS_XML_UNIQUE_ID_TEXT *)text; + + if (!(*ret = alloc_utf8_text( NULL, len_old + 46 ))) return E_OUTOFMEMORY; + if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); + (*ret)->value.length = format_urn( &id->value, (*ret)->value.bytes + len_old ) + len_old; + return S_OK; + } + case WS_XML_TEXT_TYPE_DATETIME: + { + const WS_XML_DATETIME_TEXT *dt = (const WS_XML_DATETIME_TEXT *)text; + + if (!(*ret = alloc_utf8_text( NULL, len_old + 34 ))) return E_OUTOFMEMORY; + if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); + (*ret)->value.length = format_datetime( &dt->value, (*ret)->value.bytes + len_old ) + len_old; + return S_OK; + } + case WS_XML_TEXT_TYPE_QNAME: + { + const WS_XML_QNAME_TEXT *qn = (const WS_XML_QNAME_TEXT *)text; + ULONG len = qn->localName->length; + + if (qn->prefix && qn->prefix->length) len += qn->prefix->length + 1; + if (!(*ret = alloc_utf8_text( NULL, len_old + len ))) return E_OUTOFMEMORY; + if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); + (*ret)->value.length = format_qname( qn->prefix, qn->localName, (*ret)->value.bytes + len_old ) + len_old; + return S_OK; + } + default: + FIXME( "unhandled text type %u\n", text->textType ); + return E_NOTIMPL; + } +} + +static HRESULT write_attribute_value_bin( struct writer *writer, const WS_XML_TEXT *text ) +{ + enum record_type type; + BOOL use_dict = FALSE; + HRESULT hr; + ULONG id; + + if (text && text->textType == WS_XML_TEXT_TYPE_UTF8) + { + const WS_XML_UTF8_TEXT *utf8 = (const WS_XML_UTF8_TEXT *)text; + use_dict = get_string_id( writer, &utf8->value, &id ); + } + type = get_attr_text_record_type( text, use_dict ); + + if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; + write_char( writer, type ); + + switch (type) + { + case RECORD_CHARS8_TEXT: + { + const WS_XML_UTF8_TEXT *text_utf8; + WS_XML_UTF8_TEXT *new = NULL; + UINT8 len; + + if (!text) + { + if ((hr = write_grow_buffer( writer, 1 )) != S_OK) return hr; + write_char( writer, 0 ); + return S_OK; + } + if (text->textType == WS_XML_TEXT_TYPE_UTF8) text_utf8 = (const WS_XML_UTF8_TEXT *)text; + else + { + if ((hr = text_to_utf8text( text, NULL, NULL, &new )) != S_OK) return hr; + text_utf8 = new; + } + len = text_utf8->value.length; + if ((hr = write_grow_buffer( writer, sizeof(len) + len )) != S_OK) + { + heap_free( new ); + return hr; + } + write_char( writer, len ); + write_bytes( writer, text_utf8->value.bytes, len ); + heap_free( new ); + return S_OK; + } + case RECORD_CHARS16_TEXT: + { + const WS_XML_UTF8_TEXT *text_utf8; + WS_XML_UTF8_TEXT *new = NULL; + UINT16 len; + + if (text->textType == WS_XML_TEXT_TYPE_UTF8) text_utf8 = (const WS_XML_UTF8_TEXT *)text; + else + { + if ((hr = text_to_utf8text( text, NULL, NULL, &new )) != S_OK) return hr; + text_utf8 = new; + } + len = text_utf8->value.length; + if ((hr = write_grow_buffer( writer, sizeof(len) + len )) != S_OK) + { + heap_free( new ); + return hr; + } + write_bytes( writer, (const BYTE *)&len, sizeof(len) ); + write_bytes( writer, text_utf8->value.bytes, len ); + heap_free( new ); + return S_OK; + } + case RECORD_BYTES8_TEXT: + { + WS_XML_BASE64_TEXT *text_base64 = (WS_XML_BASE64_TEXT *)text; + if ((hr = write_grow_buffer( writer, 1 + text_base64->length )) != S_OK) return hr; + write_char( writer, text_base64->length ); + write_bytes( writer, text_base64->bytes, text_base64->length ); + return S_OK; + } + case RECORD_BYTES16_TEXT: + { + WS_XML_BASE64_TEXT *text_base64 = (WS_XML_BASE64_TEXT *)text; + UINT16 len = text_base64->length; + if ((hr = write_grow_buffer( writer, sizeof(len) + len )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&len, sizeof(len) ); + write_bytes( writer, text_base64->bytes, len ); + return S_OK; + } + case RECORD_ZERO_TEXT: + case RECORD_ONE_TEXT: + case RECORD_FALSE_TEXT: + case RECORD_TRUE_TEXT: + return S_OK; + + case RECORD_INT8_TEXT: + { + INT8 val = get_text_value_int( text ); + if ((hr = write_grow_buffer( writer, sizeof(val) )) != S_OK) return hr; + write_char( writer, val ); + return S_OK; + } + case RECORD_INT16_TEXT: + { + INT16 val = get_text_value_int( text ); + if ((hr = write_grow_buffer( writer, sizeof(val) )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&val, sizeof(val) ); + return S_OK; + } + case RECORD_INT32_TEXT: + { + INT32 val = get_text_value_int( text ); + if ((hr = write_grow_buffer( writer, sizeof(val) )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&val, sizeof(val) ); + return S_OK; + } + case RECORD_INT64_TEXT: + { + INT64 val = get_text_value_int( text ); + if ((hr = write_grow_buffer( writer, sizeof(val) )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&val, sizeof(val) ); + return S_OK; + } + case RECORD_UINT64_TEXT: + { + WS_XML_UINT64_TEXT *text_uint64 = (WS_XML_UINT64_TEXT *)text; + if ((hr = write_grow_buffer( writer, sizeof(text_uint64->value) )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&text_uint64->value, sizeof(text_uint64->value) ); + return S_OK; + } + case RECORD_DOUBLE_TEXT: + { + WS_XML_DOUBLE_TEXT *text_double = (WS_XML_DOUBLE_TEXT *)text; + if ((hr = write_grow_buffer( writer, sizeof(text_double->value) )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&text_double->value, sizeof(text_double->value) ); + return S_OK; + } + case RECORD_GUID_TEXT: + { + WS_XML_GUID_TEXT *text_guid = (WS_XML_GUID_TEXT *)text; + if ((hr = write_grow_buffer( writer, sizeof(text_guid->value) )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&text_guid->value, sizeof(text_guid->value) ); + return S_OK; + } + case RECORD_UNIQUE_ID_TEXT: + { + WS_XML_UNIQUE_ID_TEXT *text_unique_id = (WS_XML_UNIQUE_ID_TEXT *)text; + if ((hr = write_grow_buffer( writer, sizeof(text_unique_id->value) )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&text_unique_id->value, sizeof(text_unique_id->value) ); + return S_OK; + } + case RECORD_DATETIME_TEXT: + { + WS_XML_DATETIME_TEXT *text_datetime = (WS_XML_DATETIME_TEXT *)text; + UINT64 val = text_datetime->value.ticks; + + assert( val <= TICKS_MAX ); + if (text_datetime->value.format == WS_DATETIME_FORMAT_UTC) val |= (UINT64)1 << 62; + else if (text_datetime->value.format == WS_DATETIME_FORMAT_LOCAL) val |= (UINT64)1 << 63; + + if ((hr = write_grow_buffer( writer, sizeof(val) )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)&val, sizeof(val) ); + return S_OK; + } + default: + FIXME( "unhandled record type %02x\n", type ); + return E_NOTIMPL; + } +} + +static enum record_type get_attr_record_type( const WS_XML_ATTRIBUTE *attr, BOOL use_dict ) +{ + if (!attr->prefix || !attr->prefix->length) + { + if (use_dict) return RECORD_SHORT_DICTIONARY_ATTRIBUTE; + return RECORD_SHORT_ATTRIBUTE; + } if (attr->prefix->length == 1 && attr->prefix->bytes[0] >= 'a' && attr->prefix->bytes[0] <= 'z') { if (use_dict) return RECORD_PREFIX_DICTIONARY_ATTRIBUTE_A + attr->prefix->bytes[0] - 'a'; @@ -1584,236 +2006,15 @@ static HRESULT write_add_attribute( struct writer *writer, const WS_XML_STRING * /************************************************************************** * WsWriteStartAttribute [webservices.@] */ -HRESULT WINAPI WsWriteStartAttribute( WS_XML_WRITER *handle, const WS_XML_STRING *prefix, - const WS_XML_STRING *localname, const WS_XML_STRING *ns, - BOOL single, WS_ERROR *error ) -{ - struct writer *writer = (struct writer *)handle; - HRESULT hr; - - TRACE( "%p %s %s %s %d %p\n", handle, debugstr_xmlstr(prefix), debugstr_xmlstr(localname), - debugstr_xmlstr(ns), single, error ); - if (error) FIXME( "ignoring error parameter\n" ); - - if (!writer || !localname || !ns) return E_INVALIDARG; - - EnterCriticalSection( &writer->cs ); - - if (writer->magic != WRITER_MAGIC) - { - LeaveCriticalSection( &writer->cs ); - return E_INVALIDARG; - } - - if (writer->state != WRITER_STATE_STARTELEMENT) - { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; - } - - if ((hr = write_add_attribute( writer, prefix, localname, ns, single )) == S_OK) - writer->state = WRITER_STATE_STARTATTRIBUTE; - - LeaveCriticalSection( &writer->cs ); - return hr; -} - -/* flush current start element if necessary */ -static HRESULT write_flush( struct writer *writer ) -{ - if (writer->state == WRITER_STATE_STARTELEMENT) - { - HRESULT hr; - if ((hr = set_namespaces( writer )) != S_OK) return hr; - if ((hr = write_startelement( writer )) != S_OK) return hr; - if ((hr = write_endstartelement( writer )) != S_OK) return hr; - writer->state = WRITER_STATE_ENDSTARTELEMENT; - } - return S_OK; -} - -static HRESULT write_add_cdata_node( struct writer *writer ) -{ - struct node *node, *parent; - if (!(parent = find_parent( writer ))) return WS_E_INVALID_FORMAT; - if (!(node = alloc_node( WS_XML_NODE_TYPE_CDATA ))) return E_OUTOFMEMORY; - write_insert_node( writer, parent, node ); - return S_OK; -} - -static HRESULT write_add_endcdata_node( struct writer *writer ) -{ - struct node *node; - if (!(node = alloc_node( WS_XML_NODE_TYPE_END_CDATA ))) return E_OUTOFMEMORY; - node->parent = writer->current; - list_add_tail( &node->parent->children, &node->entry ); - return S_OK; -} - -static HRESULT write_cdata( struct writer *writer ) -{ - HRESULT hr; - if ((hr = write_grow_buffer( writer, 9 )) != S_OK) return hr; - write_bytes( writer, (const BYTE *)"<![CDATA[", 9 ); - return S_OK; -} - -static HRESULT write_cdata_node( struct writer *writer ) -{ - HRESULT hr; - if ((hr = write_flush( writer )) != S_OK) return hr; - if ((hr = write_add_cdata_node( writer )) != S_OK) return hr; - if ((hr = write_add_endcdata_node( writer )) != S_OK) return hr; - if ((hr = write_cdata( writer )) != S_OK) return hr; - writer->state = WRITER_STATE_STARTCDATA; - return S_OK; -} - -/************************************************************************** - * WsWriteStartCData [webservices.@] - */ -HRESULT WINAPI WsWriteStartCData( WS_XML_WRITER *handle, WS_ERROR *error ) -{ - struct writer *writer = (struct writer *)handle; - HRESULT hr; - - TRACE( "%p %p\n", handle, error ); - if (error) FIXME( "ignoring error parameter\n" ); - - if (!writer) return E_INVALIDARG; - - EnterCriticalSection( &writer->cs ); - - if (writer->magic != WRITER_MAGIC) - { - LeaveCriticalSection( &writer->cs ); - return E_INVALIDARG; - } - - hr = write_cdata_node( writer ); - - LeaveCriticalSection( &writer->cs ); - return hr; -} - -static HRESULT write_endcdata( struct writer *writer ) -{ - HRESULT hr; - if ((hr = write_grow_buffer( writer, 3 )) != S_OK) return hr; - write_bytes( writer, (const BYTE *)"]]>", 3 ); - return S_OK; -} - -static HRESULT write_endcdata_node( struct writer *writer ) -{ - HRESULT hr; - if ((hr = write_endcdata( writer )) != S_OK) return hr; - writer->current = writer->current->parent; - writer->state = WRITER_STATE_ENDCDATA; - return S_OK; -} - -/************************************************************************** - * WsWriteEndCData [webservices.@] - */ -HRESULT WINAPI WsWriteEndCData( WS_XML_WRITER *handle, WS_ERROR *error ) -{ - struct writer *writer = (struct writer *)handle; - HRESULT hr; - - TRACE( "%p %p\n", handle, error ); - if (error) FIXME( "ignoring error parameter\n" ); - - if (!writer) return E_INVALIDARG; - - EnterCriticalSection( &writer->cs ); - - if (writer->magic != WRITER_MAGIC) - { - LeaveCriticalSection( &writer->cs ); - return E_INVALIDARG; - } - - if (writer->state != WRITER_STATE_TEXT) - { - LeaveCriticalSection( &writer->cs ); - return WS_E_INVALID_OPERATION; - } - - hr = write_endcdata_node( writer ); - - LeaveCriticalSection( &writer->cs ); - return hr; -} - -static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRING *prefix, - const WS_XML_STRING *localname, const WS_XML_STRING *ns ) -{ - struct node *node, *parent; - WS_XML_ELEMENT_NODE *elem; - - if (!(parent = find_parent( writer ))) return WS_E_INVALID_FORMAT; - - if (!prefix && node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT) - { - elem = &parent->hdr; - if (WsXmlStringEquals( ns, elem->ns, NULL ) == S_OK) prefix = elem->prefix; - } - - if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) return E_OUTOFMEMORY; - elem = &node->hdr; - - if (prefix && !(elem->prefix = dup_xml_string( prefix, writer->dict_do_lookup ))) - { - free_node( node ); - return E_OUTOFMEMORY; - } - if (!(elem->localName = dup_xml_string( localname, writer->dict_do_lookup ))) - { - free_node( node ); - return E_OUTOFMEMORY; - } - if (!(elem->ns = dup_xml_string( ns, writer->dict_do_lookup ))) - { - free_node( node ); - return E_OUTOFMEMORY; - } - write_insert_node( writer, parent, node ); - return S_OK; -} - -static HRESULT write_add_endelement_node( struct writer *writer, struct node *parent ) -{ - struct node *node; - if (!(node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ))) return E_OUTOFMEMORY; - node->parent = parent; - list_add_tail( &parent->children, &node->entry ); - return S_OK; -} - -static HRESULT write_element_node( struct writer *writer, const WS_XML_STRING *prefix, - const WS_XML_STRING *localname, const WS_XML_STRING *ns ) -{ - HRESULT hr; - if ((hr = write_flush( writer )) != S_OK) return hr; - if ((hr = write_add_element_node( writer, prefix, localname, ns )) != S_OK) return hr; - if ((hr = write_add_endelement_node( writer, writer->current )) != S_OK) return hr; - writer->state = WRITER_STATE_STARTELEMENT; - return S_OK; -} - -/************************************************************************** - * WsWriteStartElement [webservices.@] - */ -HRESULT WINAPI WsWriteStartElement( WS_XML_WRITER *handle, const WS_XML_STRING *prefix, - const WS_XML_STRING *localname, const WS_XML_STRING *ns, - WS_ERROR *error ) +HRESULT WINAPI WsWriteStartAttribute( WS_XML_WRITER *handle, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname, const WS_XML_STRING *ns, + BOOL single, WS_ERROR *error ) { struct writer *writer = (struct writer *)handle; HRESULT hr; - TRACE( "%p %s %s %s %p\n", handle, debugstr_xmlstr(prefix), debugstr_xmlstr(localname), - debugstr_xmlstr(ns), error ); + TRACE( "%p %s %s %s %d %p\n", handle, debugstr_xmlstr(prefix), debugstr_xmlstr(localname), + debugstr_xmlstr(ns), single, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!writer || !localname || !ns) return E_INVALIDARG; @@ -1826,394 +2027,231 @@ HRESULT WINAPI WsWriteStartElement( WS_XML_WRITER *handle, const WS_XML_STRING * return E_INVALIDARG; } - hr = write_element_node( writer, prefix, localname, ns ); + if (writer->state != WRITER_STATE_STARTELEMENT) + { + LeaveCriticalSection( &writer->cs ); + return WS_E_INVALID_OPERATION; + } + + if ((hr = write_add_attribute( writer, prefix, localname, ns, single )) == S_OK) + writer->state = WRITER_STATE_STARTATTRIBUTE; LeaveCriticalSection( &writer->cs ); return hr; } -static ULONG format_bool( const BOOL *ptr, unsigned char *buf ) +/* flush current start element if necessary */ +static HRESULT write_flush( struct writer *writer ) { - static const unsigned char bool_true[] = {'t','r','u','e'}, bool_false[] = {'f','a','l','s','e'}; - if (*ptr) + if (writer->state == WRITER_STATE_STARTELEMENT) { - memcpy( buf, bool_true, sizeof(bool_true) ); - return sizeof(bool_true); + HRESULT hr; + if ((hr = set_namespaces( writer )) != S_OK) return hr; + if ((hr = write_startelement( writer )) != S_OK) return hr; + if ((hr = write_endstartelement( writer )) != S_OK) return hr; + writer->state = WRITER_STATE_ENDSTARTELEMENT; } - memcpy( buf, bool_false, sizeof(bool_false) ); - return sizeof(bool_false); + return S_OK; } -static ULONG format_int32( const INT32 *ptr, unsigned char *buf ) +static HRESULT write_add_cdata_node( struct writer *writer ) { - return wsprintfA( (char *)buf, "%d", *ptr ); + struct node *node, *parent; + if (!(parent = find_parent( writer ))) return WS_E_INVALID_FORMAT; + if (!(node = alloc_node( WS_XML_NODE_TYPE_CDATA ))) return E_OUTOFMEMORY; + write_insert_node( writer, parent, node ); + return S_OK; } -static ULONG format_int64( const INT64 *ptr, unsigned char *buf ) +static HRESULT write_add_endcdata_node( struct writer *writer ) { - return wsprintfA( (char *)buf, "%I64d", *ptr ); + struct node *node; + if (!(node = alloc_node( WS_XML_NODE_TYPE_END_CDATA ))) return E_OUTOFMEMORY; + node->parent = writer->current; + list_add_tail( &node->parent->children, &node->entry ); + return S_OK; } -static ULONG format_uint64( const UINT64 *ptr, unsigned char *buf ) +static HRESULT write_cdata( struct writer *writer ) { - return wsprintfA( (char *)buf, "%I64u", *ptr ); + HRESULT hr; + if ((hr = write_grow_buffer( writer, 9 )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)"<![CDATA[", 9 ); + return S_OK; } -static ULONG format_double( const double *ptr, unsigned char *buf ) +static HRESULT write_cdata_node( struct writer *writer ) { -#ifdef HAVE_POWL - static const long double precision = 0.0000000000000001; - unsigned char *p = buf; - long double val = *ptr; - int neg, mag, mag2, use_exp; + HRESULT hr; + if ((hr = write_flush( writer )) != S_OK) return hr; + if ((hr = write_add_cdata_node( writer )) != S_OK) return hr; + if ((hr = write_add_endcdata_node( writer )) != S_OK) return hr; + if ((hr = write_cdata( writer )) != S_OK) return hr; + writer->state = WRITER_STATE_STARTCDATA; + return S_OK; +} - if (isnan( val )) - { - memcpy( buf, "NaN", 3 ); - return 3; - } - if (isinf( val )) - { - if (val < 0) - { - memcpy( buf, "-INF", 4 ); - return 4; - } - memcpy( buf, "INF", 3 ); - return 3; - } - if (val == 0.0) - { - *p = '0'; - return 1; - } +/************************************************************************** + * WsWriteStartCData [webservices.@] + */ +HRESULT WINAPI WsWriteStartCData( WS_XML_WRITER *handle, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + HRESULT hr; - if ((neg = val < 0)) - { - *p++ = '-'; - val = -val; - } + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); - mag = log10l( val ); - use_exp = (mag >= 15 || (neg && mag >= 1) || mag <= -1); - if (use_exp) - { - if (mag < 0) mag -= 1; - val = val / powl( 10.0, mag ); - mag2 = mag; - mag = 0; - } - else if (mag < 1) mag = 0; + if (!writer) return E_INVALIDARG; - while (val > precision || mag >= 0) - { - long double weight = powl( 10.0, mag ); - if (weight > 0 && !isinf( weight )) - { - int digit = floorl( val / weight ); - val -= digit * weight; - *(p++) = '0' + digit; - } - if (!mag && val > precision) *(p++) = '.'; - mag--; - } + EnterCriticalSection( &writer->cs ); - if (use_exp) + if (writer->magic != WRITER_MAGIC) { - int i, j; - *(p++) = 'E'; - if (mag2 > 0) *(p++) = '+'; - else - { - *(p++) = '-'; - mag2 = -mag2; - } - mag = 0; - while (mag2 > 0) - { - *(p++) = '0' + mag2 % 10; - mag2 /= 10; - mag++; - } - for (i = -mag, j = -1; i < j; i++, j--) - { - p[i] ^= p[j]; - p[j] ^= p[i]; - p[i] ^= p[j]; - } + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; } - return p - buf; -#else - FIXME( "powl not found at build time\n" ); - return 0; -#endif -} + hr = write_cdata_node( writer ); -static inline int year_size( int year ) -{ - return leap_year( year ) ? 366 : 365; + LeaveCriticalSection( &writer->cs ); + return hr; } -#define TZ_OFFSET 8 -static ULONG format_datetime( const WS_DATETIME *ptr, unsigned char *buf ) +static HRESULT write_endcdata( struct writer *writer ) { - static const char fmt[] = "%04u-%02u-%02uT%02u:%02u:%02u"; - int day, hour, min, sec, sec_frac, month = 0, year = 1, tz_hour; - unsigned __int64 ticks, day_ticks; - ULONG len; - - if (ptr->format == WS_DATETIME_FORMAT_LOCAL && - ptr->ticks >= TICKS_1601_01_01 + TZ_OFFSET * TICKS_PER_HOUR) - { - ticks = ptr->ticks - TZ_OFFSET * TICKS_PER_HOUR; - tz_hour = TZ_OFFSET; - } - else - { - ticks = ptr->ticks; - tz_hour = 0; - } - day = ticks / TICKS_PER_DAY; - day_ticks = ticks % TICKS_PER_DAY; - hour = day_ticks / TICKS_PER_HOUR; - min = (day_ticks % TICKS_PER_HOUR) / TICKS_PER_MIN; - sec = (day_ticks % TICKS_PER_MIN) / TICKS_PER_SEC; - sec_frac = day_ticks % TICKS_PER_SEC; - - while (day >= year_size( year )) - { - day -= year_size( year ); - year++; - } - while (day >= month_days[leap_year( year )][month]) - { - day -= month_days[leap_year( year )][month]; - month++; - } - - len = sprintf( (char *)buf, fmt, year, month + 1, day + 1, hour, min, sec ); - if (sec_frac) - { - static const char fmt_frac[] = ".%07u"; - len += sprintf( (char *)buf + len, fmt_frac, sec_frac ); - while (buf[len - 1] == '0') len--; - } - if (ptr->format == WS_DATETIME_FORMAT_UTC) - { - buf[len++] = 'Z'; - } - else if (ptr->format == WS_DATETIME_FORMAT_LOCAL) - { - static const char fmt_tz[] = "%c%02u:00"; - len += sprintf( (char *)buf + len, fmt_tz, tz_hour ? '-' : '+', tz_hour ); - } - - return len; + HRESULT hr; + if ((hr = write_grow_buffer( writer, 3 )) != S_OK) return hr; + write_bytes( writer, (const BYTE *)"]]>", 3 ); + return S_OK; } -static ULONG format_guid( const GUID *ptr, unsigned char *buf ) +static HRESULT write_endcdata_node( struct writer *writer ) { - static const char fmt[] = "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x"; - return sprintf( (char *)buf, fmt, ptr->Data1, ptr->Data2, ptr->Data3, - ptr->Data4[0], ptr->Data4[1], ptr->Data4[2], ptr->Data4[3], - ptr->Data4[4], ptr->Data4[5], ptr->Data4[6], ptr->Data4[7] ); + HRESULT hr; + if ((hr = write_endcdata( writer )) != S_OK) return hr; + writer->current = writer->current->parent; + writer->state = WRITER_STATE_ENDCDATA; + return S_OK; } -static ULONG format_urn( const GUID *ptr, unsigned char *buf ) +/************************************************************************** + * WsWriteEndCData [webservices.@] + */ +HRESULT WINAPI WsWriteEndCData( WS_XML_WRITER *handle, WS_ERROR *error ) { - static const char fmt[] = "urn:uuid:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x"; - return sprintf( (char *)buf, fmt, ptr->Data1, ptr->Data2, ptr->Data3, - ptr->Data4[0], ptr->Data4[1], ptr->Data4[2], ptr->Data4[3], - ptr->Data4[4], ptr->Data4[5], ptr->Data4[6], ptr->Data4[7] ); -} + struct writer *writer = (struct writer *)handle; + HRESULT hr; + + TRACE( "%p %p\n", handle, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer) return E_INVALIDARG; + + EnterCriticalSection( &writer->cs ); -static ULONG format_qname( const WS_XML_STRING *prefix, const WS_XML_STRING *localname, unsigned char *buf ) -{ - ULONG len = 0; - if (prefix && prefix->length) + if (writer->magic != WRITER_MAGIC) { - memcpy( buf, prefix->bytes, prefix->length ); - len += prefix->length; - buf[len++] = ':'; + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; } - memcpy( buf + len, localname->bytes, localname->length ); - return len + localname->length; -} - -static ULONG encode_base64( const unsigned char *bin, ULONG len, unsigned char *buf ) -{ - static const char base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - ULONG i = 0, x; - while (len > 0) + if (writer->state != WRITER_STATE_TEXT) { - buf[i++] = base64[(bin[0] & 0xfc) >> 2]; - x = (bin[0] & 3) << 4; - if (len == 1) - { - buf[i++] = base64[x]; - buf[i++] = '='; - buf[i++] = '='; - break; - } - buf[i++] = base64[x | ((bin[1] & 0xf0) >> 4)]; - x = (bin[1] & 0x0f) << 2; - if (len == 2) - { - buf[i++] = base64[x]; - buf[i++] = '='; - break; - } - buf[i++] = base64[x | ((bin[2] & 0xc0) >> 6)]; - buf[i++] = base64[bin[2] & 0x3f]; - bin += 3; - len -= 3; + LeaveCriticalSection( &writer->cs ); + return WS_E_INVALID_OPERATION; } - return i; + + hr = write_endcdata_node( writer ); + + LeaveCriticalSection( &writer->cs ); + return hr; } -static HRESULT text_to_utf8text( const WS_XML_TEXT *text, const WS_XML_UTF8_TEXT *old, ULONG *offset, - WS_XML_UTF8_TEXT **ret ) +static HRESULT write_add_element_node( struct writer *writer, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname, const WS_XML_STRING *ns ) { - ULONG len_old = old ? old->value.length : 0; - if (offset) *offset = len_old; + struct node *node, *parent; + WS_XML_ELEMENT_NODE *elem; - switch (text->textType) - { - case WS_XML_TEXT_TYPE_UTF8: - { - const WS_XML_UTF8_TEXT *src = (const WS_XML_UTF8_TEXT *)text; + if (!(parent = find_parent( writer ))) return WS_E_INVALID_FORMAT; - if (!(*ret = alloc_utf8_text( NULL, len_old + src->value.length ))) return E_OUTOFMEMORY; - if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); - memcpy( (*ret)->value.bytes + len_old, src->value.bytes, src->value.length ); - return S_OK; - } - case WS_XML_TEXT_TYPE_UTF16: + if (!prefix && node_type( parent ) == WS_XML_NODE_TYPE_ELEMENT) { - const WS_XML_UTF16_TEXT *src = (const WS_XML_UTF16_TEXT *)text; - const WCHAR *str = (const WCHAR *)src->bytes; - ULONG len = src->byteCount / sizeof(WCHAR), len_utf8; - - if (src->byteCount % sizeof(WCHAR)) return E_INVALIDARG; - len_utf8 = WideCharToMultiByte( CP_UTF8, 0, str, len, NULL, 0, NULL, NULL ); - if (!(*ret = alloc_utf8_text( NULL, len_old + len_utf8 ))) return E_OUTOFMEMORY; - if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); - WideCharToMultiByte( CP_UTF8, 0, str, len, (char *)(*ret)->value.bytes + len_old, len_utf8, NULL, NULL ); - return S_OK; + elem = &parent->hdr; + if (WsXmlStringEquals( ns, elem->ns, NULL ) == S_OK) prefix = elem->prefix; } - case WS_XML_TEXT_TYPE_BASE64: - { - const WS_XML_BASE64_TEXT *base64 = (const WS_XML_BASE64_TEXT *)text; - ULONG len = ((4 * base64->length / 3) + 3) & ~3; - if (!(*ret = alloc_utf8_text( NULL, len_old + len ))) return E_OUTOFMEMORY; - if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); - (*ret)->value.length = encode_base64( base64->bytes, base64->length, (*ret)->value.bytes + len_old ) + len_old; - return S_OK; - } - case WS_XML_TEXT_TYPE_BOOL: - { - const WS_XML_BOOL_TEXT *bool_text = (const WS_XML_BOOL_TEXT *)text; + if (!(node = alloc_node( WS_XML_NODE_TYPE_ELEMENT ))) return E_OUTOFMEMORY; + elem = &node->hdr; - if (!(*ret = alloc_utf8_text( NULL, len_old + 5 ))) return E_OUTOFMEMORY; - if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); - (*ret)->value.length = format_bool( &bool_text->value, (*ret)->value.bytes + len_old ) + len_old; - return S_OK; - } - case WS_XML_TEXT_TYPE_INT32: + if (prefix && !(elem->prefix = dup_xml_string( prefix, writer->dict_do_lookup ))) { - const WS_XML_INT32_TEXT *int32_text = (const WS_XML_INT32_TEXT *)text; - unsigned char buf[12]; /* "-2147483648" */ - ULONG len = format_int32( &int32_text->value, buf ); - - if (!(*ret = alloc_utf8_text( NULL, len_old + len ))) return E_OUTOFMEMORY; - if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); - memcpy( (*ret)->value.bytes + len_old, buf, len ); - return S_OK; + free_node( node ); + return E_OUTOFMEMORY; } - case WS_XML_TEXT_TYPE_INT64: + if (!(elem->localName = dup_xml_string( localname, writer->dict_do_lookup ))) { - const WS_XML_INT64_TEXT *int64_text = (const WS_XML_INT64_TEXT *)text; - unsigned char buf[21]; /* "-9223372036854775808" */ - ULONG len = format_int64( &int64_text->value, buf ); - - if (!(*ret = alloc_utf8_text( NULL, len_old + len ))) return E_OUTOFMEMORY; - if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); - memcpy( (*ret)->value.bytes + len_old, buf, len ); - return S_OK; + free_node( node ); + return E_OUTOFMEMORY; } - case WS_XML_TEXT_TYPE_UINT64: + if (!(elem->ns = dup_xml_string( ns, writer->dict_do_lookup ))) { - const WS_XML_UINT64_TEXT *uint64_text = (const WS_XML_UINT64_TEXT *)text; - unsigned char buf[21]; /* "18446744073709551615" */ - ULONG len = format_uint64( &uint64_text->value, buf ); - - if (!(*ret = alloc_utf8_text( NULL, len_old + len ))) return E_OUTOFMEMORY; - if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); - memcpy( (*ret)->value.bytes + len_old, buf, len ); - return S_OK; + free_node( node ); + return E_OUTOFMEMORY; } - case WS_XML_TEXT_TYPE_DOUBLE: - { - const WS_XML_DOUBLE_TEXT *double_text = (const WS_XML_DOUBLE_TEXT *)text; - unsigned char buf[32]; /* "-1.1111111111111111E-308", oversized to address Valgrind limitations */ - unsigned short fpword; - ULONG len; + write_insert_node( writer, parent, node ); + return S_OK; +} - if (!set_fpword( 0x37f, &fpword )) return E_NOTIMPL; - len = format_double( &double_text->value, buf ); - restore_fpword( fpword ); - if (!len) return E_NOTIMPL; +static HRESULT write_add_endelement_node( struct writer *writer, struct node *parent ) +{ + struct node *node; + if (!(node = alloc_node( WS_XML_NODE_TYPE_END_ELEMENT ))) return E_OUTOFMEMORY; + node->parent = parent; + list_add_tail( &parent->children, &node->entry ); + return S_OK; +} - if (!(*ret = alloc_utf8_text( NULL, len_old + len ))) return E_OUTOFMEMORY; - if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); - memcpy( (*ret)->value.bytes + len_old, buf, len ); - return S_OK; - } - case WS_XML_TEXT_TYPE_GUID: - { - const WS_XML_GUID_TEXT *id = (const WS_XML_GUID_TEXT *)text; +static HRESULT write_element_node( struct writer *writer, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname, const WS_XML_STRING *ns ) +{ + HRESULT hr; + if ((hr = write_flush( writer )) != S_OK) return hr; + if ((hr = write_add_element_node( writer, prefix, localname, ns )) != S_OK) return hr; + if ((hr = write_add_endelement_node( writer, writer->current )) != S_OK) return hr; + writer->state = WRITER_STATE_STARTELEMENT; + return S_OK; +} - if (!(*ret = alloc_utf8_text( NULL, len_old + 37 ))) return E_OUTOFMEMORY; - if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); - (*ret)->value.length = format_guid( &id->value, (*ret)->value.bytes + len_old ) + len_old; - return S_OK; - } - case WS_XML_TEXT_TYPE_UNIQUE_ID: - { - const WS_XML_UNIQUE_ID_TEXT *id = (const WS_XML_UNIQUE_ID_TEXT *)text; +/************************************************************************** + * WsWriteStartElement [webservices.@] + */ +HRESULT WINAPI WsWriteStartElement( WS_XML_WRITER *handle, const WS_XML_STRING *prefix, + const WS_XML_STRING *localname, const WS_XML_STRING *ns, + WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + HRESULT hr; - if (!(*ret = alloc_utf8_text( NULL, len_old + 46 ))) return E_OUTOFMEMORY; - if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); - (*ret)->value.length = format_urn( &id->value, (*ret)->value.bytes + len_old ) + len_old; - return S_OK; - } - case WS_XML_TEXT_TYPE_DATETIME: - { - const WS_XML_DATETIME_TEXT *dt = (const WS_XML_DATETIME_TEXT *)text; + TRACE( "%p %s %s %s %p\n", handle, debugstr_xmlstr(prefix), debugstr_xmlstr(localname), + debugstr_xmlstr(ns), error ); + if (error) FIXME( "ignoring error parameter\n" ); - if (!(*ret = alloc_utf8_text( NULL, len_old + 34 ))) return E_OUTOFMEMORY; - if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); - (*ret)->value.length = format_datetime( &dt->value, (*ret)->value.bytes + len_old ) + len_old; - return S_OK; - } - case WS_XML_TEXT_TYPE_QNAME: - { - const WS_XML_QNAME_TEXT *qn = (const WS_XML_QNAME_TEXT *)text; - ULONG len = qn->localName->length; + if (!writer || !localname || !ns) return E_INVALIDARG; - if (qn->prefix && qn->prefix->length) len += qn->prefix->length + 1; - if (!(*ret = alloc_utf8_text( NULL, len_old + len ))) return E_OUTOFMEMORY; - if (old) memcpy( (*ret)->value.bytes, old->value.bytes, len_old ); - (*ret)->value.length = format_qname( qn->prefix, qn->localName, (*ret)->value.bytes + len_old ) + len_old; - return S_OK; - } - default: - FIXME( "unhandled text type %u\n", text->textType ); - return E_NOTIMPL; + EnterCriticalSection( &writer->cs ); + + if (writer->magic != WRITER_MAGIC) + { + LeaveCriticalSection( &writer->cs ); + return E_INVALIDARG; } + + hr = write_element_node( writer, prefix, localname, ns ); + + LeaveCriticalSection( &writer->cs ); + return hr; } static HRESULT text_to_text( const WS_XML_TEXT *text, const WS_XML_TEXT *old, ULONG *offset, WS_XML_TEXT **ret ) @@ -2238,16 +2276,14 @@ static HRESULT text_to_text( const WS_XML_TEXT *text, const WS_XML_TEXT *old, UL case WS_XML_TEXT_TYPE_UTF16: { const WS_XML_UTF16_TEXT *utf16 = (const WS_XML_UTF16_TEXT *)text; - const WS_XML_UTF8_TEXT *utf8_old = (const WS_XML_UTF8_TEXT *)old; - WS_XML_UTF8_TEXT *new; - const WCHAR *str = (const WCHAR *)utf16->bytes; - ULONG len = utf16->byteCount / sizeof(WCHAR), len_utf8, len_old = utf8_old ? utf8_old->value.length : 0; + const WS_XML_UTF16_TEXT *utf16_old = (const WS_XML_UTF16_TEXT *)old; + WS_XML_UTF16_TEXT *new; + ULONG len = utf16->byteCount, len_old = utf16_old ? utf16_old->byteCount : 0; if (utf16->byteCount % sizeof(WCHAR)) return E_INVALIDARG; - len_utf8 = WideCharToMultiByte( CP_UTF8, 0, str, len, NULL, 0, NULL, NULL ); - if (!(new = alloc_utf8_text( NULL, len_old + len_utf8 ))) return E_OUTOFMEMORY; - if (old) memcpy( new->value.bytes, utf8_old->value.bytes, len_old ); - WideCharToMultiByte( CP_UTF8, 0, str, len, (char *)new->value.bytes + len_old, len_utf8, NULL, NULL ); + if (!(new = alloc_utf16_text( NULL, len_old + len ))) return E_OUTOFMEMORY; + if (utf16_old) memcpy( new->bytes, utf16_old->bytes, len_old ); + memcpy( new->bytes + len_old, utf16->bytes, len ); if (offset) *offset = len_old; *ret = &new->text; return S_OK; @@ -2477,6 +2513,15 @@ static enum record_type get_text_record_type( const WS_XML_TEXT *text, BOOL use_ if (text_utf8->value.length <= MAX_UINT16) return RECORD_CHARS16_TEXT_WITH_ENDELEMENT; return RECORD_CHARS32_TEXT_WITH_ENDELEMENT; } + case WS_XML_TEXT_TYPE_UTF16: + { + const WS_XML_UTF16_TEXT *text_utf16 = (const WS_XML_UTF16_TEXT *)text; + int len = text_utf16->byteCount / sizeof(WCHAR); + int len_utf8 = WideCharToMultiByte( CP_UTF8, 0, (const WCHAR *)text_utf16->bytes, len, NULL, 0, NULL, NULL ); + if (len_utf8 <= MAX_UINT8) return RECORD_CHARS8_TEXT_WITH_ENDELEMENT; + if (len_utf8 <= MAX_UINT16) return RECORD_CHARS16_TEXT_WITH_ENDELEMENT; + return RECORD_CHARS32_TEXT_WITH_ENDELEMENT; + } case WS_XML_TEXT_TYPE_BASE64: { const WS_XML_BASE64_TEXT *text_base64 = (const WS_XML_BASE64_TEXT *)text; @@ -2570,24 +2615,50 @@ static HRESULT write_text_bin( struct writer *writer, const WS_XML_TEXT *text, U { case RECORD_CHARS8_TEXT_WITH_ENDELEMENT: { - const WS_XML_UTF8_TEXT *text_utf8 = (const WS_XML_UTF8_TEXT *)text; - UINT8 len = text_utf8->value.length; + const WS_XML_UTF8_TEXT *text_utf8; + WS_XML_UTF8_TEXT *new = NULL; + UINT8 len; - if ((hr = write_grow_buffer( writer, 1 + sizeof(len) + len )) != S_OK) return hr; + if (text->textType == WS_XML_TEXT_TYPE_UTF8) text_utf8 = (const WS_XML_UTF8_TEXT *)text; + else + { + if ((hr = text_to_utf8text( text, NULL, NULL, &new )) != S_OK) return hr; + text_utf8 = new; + } + len = text_utf8->value.length; + if ((hr = write_grow_buffer( writer, 1 + sizeof(len) + len )) != S_OK) + { + heap_free( new ); + return hr; + } write_char( writer, type ); write_char( writer, len ); write_bytes( writer, text_utf8->value.bytes, len ); + heap_free( new ); return S_OK; } case RECORD_CHARS16_TEXT_WITH_ENDELEMENT: { - const WS_XML_UTF8_TEXT *text_utf8 = (const WS_XML_UTF8_TEXT *)text; - UINT16 len = text_utf8->value.length; + const WS_XML_UTF8_TEXT *text_utf8; + WS_XML_UTF8_TEXT *new = NULL; + UINT16 len; - if ((hr = write_grow_buffer( writer, 1 + sizeof(len) + len )) != S_OK) return hr; + if (text->textType == WS_XML_TEXT_TYPE_UTF8) text_utf8 = (const WS_XML_UTF8_TEXT *)text; + else + { + if ((hr = text_to_utf8text( text, NULL, NULL, &new )) != S_OK) return hr; + text_utf8 = new; + } + len = text_utf8->value.length; + if ((hr = write_grow_buffer( writer, 1 + sizeof(len) + len )) != S_OK) + { + heap_free( new ); + return hr; + } write_char( writer, type ); write_bytes( writer, (const BYTE *)&len, sizeof(len) ); write_bytes( writer, text_utf8->value.bytes, len ); + heap_free( new ); return S_OK; } case RECORD_BYTES8_TEXT: -- 2.11.0

1 0

[PATCH 4/5] webservices: Enable dictionary lookup after setting the output buffer.
by Hans Leidekker 08 Dec '17

08 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index cce56087b9..0765e0dc6b 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1233,9 +1233,8 @@ static HRESULT CALLBACK dict_cb( void *state, const WS_XML_STRING *str, BOOL *fo static HRESULT init_writer( struct channel *channel ) { WS_XML_WRITER_BUFFER_OUTPUT buf = {{WS_XML_WRITER_OUTPUT_TYPE_BUFFER}}; - WS_XML_WRITER_TEXT_ENCODING text = {{WS_XML_WRITER_ENCODING_TYPE_TEXT}}; + WS_XML_WRITER_TEXT_ENCODING text = {{WS_XML_WRITER_ENCODING_TYPE_TEXT}, WS_CHARSET_UTF8}; WS_XML_WRITER_BINARY_ENCODING bin = {{WS_XML_WRITER_ENCODING_TYPE_BINARY}}; - WS_XML_WRITER_ENCODING *encoding; HRESULT hr; if (!channel->writer && (hr = WsCreateWriter( NULL, 0, &channel->writer, NULL )) != S_OK) return hr; @@ -1243,29 +1242,23 @@ static HRESULT init_writer( struct channel *channel ) switch (channel->encoding) { case WS_ENCODING_XML_UTF8: - text.charSet = WS_CHARSET_UTF8; - encoding = &text.encoding; - break; + return WsSetOutput( channel->writer, &text.encoding, &buf.output, NULL, 0, NULL ); case WS_ENCODING_XML_BINARY_SESSION_1: - if ((hr = writer_enable_lookup( channel->writer )) != S_OK) return hr; clear_dict( &channel->dict_send ); bin.staticDictionary = (WS_XML_DICTIONARY *)&dict_builtin_static.dict; bin.dynamicStringCallback = dict_cb; bin.dynamicStringCallbackState = &channel->dict_send; - encoding = &bin.encoding; - break; + if ((hr = WsSetOutput( channel->writer, &bin.encoding, &buf.output, NULL, 0, NULL )) != S_OK) return hr; + return writer_enable_lookup( channel->writer ); case WS_ENCODING_XML_BINARY_1: - encoding = &bin.encoding; - break; + return WsSetOutput( channel->writer, &bin.encoding, &buf.output, NULL, 0, NULL ); default: FIXME( "unhandled encoding %u\n", channel->encoding ); return WS_E_NOT_SUPPORTED; } - - return WsSetOutput( channel->writer, encoding, &buf.output, NULL, 0, NULL ); } /************************************************************************** -- 2.11.0

1 0

[PATCH 3/5] webservices: Implement WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING in the writer.
by Hans Leidekker 08 Dec '17

08 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/tests/writer.c | 106 ++++++++++++++++++++++++++++++++++++++++ dlls/webservices/writer.c | 80 +++++++++++++++++------------- 2 files changed, 151 insertions(+), 35 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 79b60d19ca..15d4569662 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -4544,6 +4544,111 @@ static void test_text_types_binary(void) WsFreeWriter( writer ); } +static void test_repeating_element_choice(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + static WS_XML_STRING str_ns = {0, NULL}, str_a = {1, (BYTE *)"a"}, str_b = {1, (BYTE *)"b"}; + static WS_XML_STRING str_s = {1, (BYTE *)"s"}, str_t = {1, (BYTE *)"t"}; + HRESULT hr; + WS_XML_WRITER *writer; + WS_UNION_DESCRIPTION u; + WS_UNION_FIELD_DESCRIPTION f, f2, *fields[2]; + WS_FIELD_DESCRIPTION f_items, *fields_items[1]; + WS_STRUCT_DESCRIPTION s; + enum choice {CHOICE_A, CHOICE_B, CHOICE_NONE}; + struct item + { + enum choice choice; + union + { + const WCHAR *a; + UINT32 b; + } value; + } items[2]; + struct test + { + struct item *items; + ULONG count; + } test; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.value = CHOICE_A; + f.field.mapping = WS_ELEMENT_FIELD_MAPPING; + f.field.localName = &str_a; + f.field.ns = &str_ns; + f.field.type = WS_WSZ_TYPE; + f.field.offset = FIELD_OFFSET(struct item, value.a); + fields[0] = &f; + + memset( &f2, 0, sizeof(f2) ); + f2.value = CHOICE_B; + f2.field.mapping = WS_ELEMENT_FIELD_MAPPING; + f2.field.localName = &str_b; + f2.field.ns = &str_ns; + f2.field.type = WS_UINT32_TYPE; + f2.field.offset = FIELD_OFFSET(struct item, value.b); + fields[1] = &f2; + + memset( &u, 0, sizeof(u) ); + u.size = sizeof(struct item); + u.alignment = TYPE_ALIGNMENT(struct item); + u.fields = fields; + u.fieldCount = 2; + u.enumOffset = FIELD_OFFSET(struct item, choice); + u.noneEnumValue = CHOICE_NONE; + + memset( &f_items, 0, sizeof(f_items) ); + f_items.mapping = WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING; + f_items.localName = &str_t; + f_items.ns = &str_ns; + f_items.type = WS_UNION_TYPE; + f_items.typeDescription = &u; + f_items.countOffset = FIELD_OFFSET(struct test, count); + fields_items[0] = &f_items; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields_items; + s.fieldCount = 1; + s.typeLocalName = &str_s; + s.typeNs = &str_ns; + + items[0].choice = CHOICE_A; + items[0].value.a = testW; + items[1].choice = CHOICE_B; + items[1].value.b = 1; + test.items = items; + test.count = 2; + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t><a>test</a><b>1</b></t>", __LINE__ ); + + items[0].choice = CHOICE_NONE; + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + test.count = 0; + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_VALUE, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<t/>", __LINE__ ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -4586,4 +4691,5 @@ START_TEST(writer) test_dictionary(); test_union_type(); test_text_types_binary(); + test_repeating_element_choice(); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 8738f4c9dd..4b2466390c 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3492,6 +3492,7 @@ static WS_WRITE_OPTION get_field_write_option( WS_TYPE type, ULONG options ) case WS_XML_QNAME_TYPE: case WS_STRUCT_TYPE: case WS_ENUM_TYPE: + case WS_UNION_TYPE: if (options & (WS_FIELD_OPTIONAL|WS_FIELD_NILLABLE)) return WS_WRITE_NILLABLE_VALUE; return WS_WRITE_REQUIRED_VALUE; @@ -3506,42 +3507,11 @@ static WS_WRITE_OPTION get_field_write_option( WS_TYPE type, ULONG options ) } } +static HRESULT write_type_field( struct writer *, const WS_FIELD_DESCRIPTION *, const char *, ULONG ); + static HRESULT write_type( struct writer *, WS_TYPE_MAPPING, WS_TYPE, const void *, WS_WRITE_OPTION, const void *, ULONG ); -static HRESULT write_type_repeating_element( struct writer *writer, const WS_FIELD_DESCRIPTION *desc, - const char *buf, ULONG count ) -{ - HRESULT hr = S_OK; - ULONG i, size, offset = 0; - WS_WRITE_OPTION option; - - if (!(option = get_field_write_option( desc->type, desc->options ))) return E_INVALIDARG; - - /* wrapper element */ - if (desc->localName && ((hr = write_element_node( writer, NULL, desc->localName, desc->ns )) != S_OK)) - return hr; - - if (option == WS_WRITE_REQUIRED_VALUE || option == WS_WRITE_NILLABLE_VALUE) - size = get_type_size( desc->type, desc->typeDescription ); - else - size = sizeof(const void *); - - for (i = 0; i < count; i++) - { - if ((hr = write_element_node( writer, NULL, desc->itemLocalName, desc->itemNs )) != S_OK) return hr; - if ((hr = write_type( writer, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->typeDescription, option, - buf + offset, size )) != S_OK) return hr; - if ((hr = write_endelement_node( writer )) != S_OK) return hr; - offset += size; - } - - if (desc->localName) hr = write_endelement_node( writer ); - return hr; -} - -static HRESULT write_type_field( struct writer *, const WS_FIELD_DESCRIPTION *, const char *, ULONG ); - static HRESULT write_type_union( struct writer *writer, const WS_UNION_DESCRIPTION *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) { @@ -3581,6 +3551,45 @@ static HRESULT write_type_union( struct writer *writer, const WS_UNION_DESCRIPTI return E_INVALIDARG; } +static HRESULT write_type_array( struct writer *writer, const WS_FIELD_DESCRIPTION *desc, const char *buf, + ULONG count ) +{ + HRESULT hr = S_OK; + ULONG i, size, offset = 0; + WS_WRITE_OPTION option; + + if (!(option = get_field_write_option( desc->type, desc->options ))) return E_INVALIDARG; + + /* wrapper element */ + if (desc->localName && ((hr = write_element_node( writer, NULL, desc->localName, desc->ns )) != S_OK)) + return hr; + + if (option == WS_WRITE_REQUIRED_VALUE || option == WS_WRITE_NILLABLE_VALUE) + size = get_type_size( desc->type, desc->typeDescription ); + else + size = sizeof(const void *); + + for (i = 0; i < count; i++) + { + if (desc->type == WS_UNION_TYPE) + { + if ((hr = write_type_union( writer, desc->typeDescription, option, buf + offset, size )) != S_OK) + return hr; + } + else + { + if ((hr = write_element_node( writer, NULL, desc->itemLocalName, desc->itemNs )) != S_OK) return hr; + if ((hr = write_type( writer, WS_ELEMENT_TYPE_MAPPING, desc->type, desc->typeDescription, option, + buf + offset, size )) != S_OK) return hr; + if ((hr = write_endelement_node( writer )) != S_OK) return hr; + } + offset += size; + } + + if (desc->localName) hr = write_endelement_node( writer ); + return hr; +} + static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTION *desc, const char *buf, ULONG offset ) { @@ -3646,8 +3655,9 @@ static HRESULT write_type_field( struct writer *writer, const WS_FIELD_DESCRIPTI return write_type_union( writer, desc->typeDescription, option, ptr, size ); case WS_REPEATING_ELEMENT_FIELD_MAPPING: + case WS_REPEATING_ELEMENT_CHOICE_FIELD_MAPPING: count = *(const ULONG *)(buf + desc->countOffset); - return write_type_repeating_element( writer, desc, *(const char **)ptr, count ); + return write_type_array( writer, desc, *(const char **)ptr, count ); case WS_TEXT_FIELD_MAPPING: switch (writer->state) @@ -4713,7 +4723,7 @@ static ULONG get_array_len( const WS_PARAMETER_DESCRIPTION *params, ULONG count, static HRESULT write_param_array( struct writer *writer, const WS_FIELD_DESCRIPTION *desc, const void *value, ULONG len ) { - return write_type_repeating_element( writer, desc, value, len ); + return write_type_array( writer, desc, value, len ); } HRESULT write_input_params( WS_XML_WRITER *handle, const WS_ELEMENT_DESCRIPTION *desc, -- 2.11.0

1 0

[PATCH 2/5] webservices: Don't require specific writer state for element mappings in WsWriteType.
by Hans Leidekker 08 Dec '17

08 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/writer.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index f6917c6ae3..8738f4c9dd 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -3893,10 +3893,6 @@ HRESULT WINAPI WsWriteType( WS_XML_WRITER *handle, WS_TYPE_MAPPING mapping, WS_T case WS_ELEMENT_TYPE_MAPPING: case WS_ELEMENT_CONTENT_TYPE_MAPPING: - if (writer->state != WRITER_STATE_STARTELEMENT) hr = WS_E_INVALID_FORMAT; - else hr = write_type( writer, mapping, type, desc, option, value, size ); - break; - case WS_ANY_ELEMENT_TYPE_MAPPING: hr = write_type( writer, mapping, type, desc, option, value, size ); break; -- 2.11.0

1 0

[PATCH 1/5] webservices: Store the async context directly in struct receive_message.
by Hans Leidekker 08 Dec '17

08 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/webservices/channel.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index 9093a6cf67..cce56087b9 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1847,7 +1847,7 @@ struct receive_message void *value; ULONG size; ULONG *index; - const WS_ASYNC_CONTEXT *ctx; + WS_ASYNC_CONTEXT ctx; }; static void receive_message_proc( struct task *task ) @@ -1858,9 +1858,9 @@ static void receive_message_proc( struct task *task ) hr = receive_message( r->channel, r->msg, r->desc, r->count, r->option, r->read_option, r->heap, r->value, r->size, r->index ); - TRACE( "calling %p(%08x)\n", r->ctx->callback, hr ); - r->ctx->callback( hr, WS_LONG_CALLBACK, r->ctx->callbackState ); - TRACE( "%p returned\n", r->ctx->callback ); + TRACE( "calling %p(%08x)\n", r->ctx.callback, hr ); + r->ctx.callback( hr, WS_LONG_CALLBACK, r->ctx.callbackState ); + TRACE( "%p returned\n", r->ctx.callback ); } static HRESULT queue_receive_message( struct channel *channel, WS_MESSAGE *msg, const WS_MESSAGE_DESCRIPTION **desc, @@ -1882,7 +1882,7 @@ static HRESULT queue_receive_message( struct channel *channel, WS_MESSAGE *msg, r->value = value; r->size = size; r->index = index; - r->ctx = ctx; + r->ctx = *ctx; return queue_task( &channel->recv_q, &r->task ); } -- 2.11.0

1 0

[PATCH 2/2] ole32: Don't clear the dirty flag when saving to another storage.
by Huw Davies 08 Dec '17

08 Dec '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 15 ++++++--------- dlls/ole32/tests/ole2.c | 3 +++ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 6a13485339..75c961164e 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1835,17 +1835,14 @@ static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *pStg ) * our responsibility to copy the information when saving to a new * storage. */ -static HRESULT WINAPI DataCache_Save( - IPersistStorage* iface, - IStorage* pStg, - BOOL fSameAsLoad) +static HRESULT WINAPI DataCache_Save(IPersistStorage* iface, IStorage *stg, BOOL same_as_load) { DataCache *This = impl_from_IPersistStorage(iface); DataCacheEntry *cache_entry; HRESULT hr = S_OK; unsigned short stream_number = 0; - TRACE("(%p, %p, %d)\n", iface, pStg, fSameAsLoad); + TRACE("(%p, %p, %d)\n", iface, stg, same_as_load); /* assign stream numbers to the cache entries */ LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) @@ -1861,17 +1858,17 @@ static HRESULT WINAPI DataCache_Save( /* write out the cache entries */ LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) { - if (!fSameAsLoad || cache_entry->dirty) + if (!same_as_load || cache_entry->dirty) { - hr = DataCacheEntry_Save(cache_entry, pStg, fSameAsLoad); + hr = DataCacheEntry_Save(cache_entry, stg, same_as_load); if (FAILED(hr)) break; - cache_entry->dirty = FALSE; + if (same_as_load) cache_entry->dirty = FALSE; } } - This->dirty = FALSE; + if (same_as_load) This->dirty = FALSE; return hr; } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index a8cbcdeb1e..f42ebe2330 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -4320,6 +4320,9 @@ static void test_data_cache_save_data(void) hr = IPersistStorage_Save(persist, doc, FALSE); ok(hr == S_OK, "unexpected %#x\n", hr); + hr = IPersistStorage_IsDirty(persist); + ok(hr == S_OK, "unexpected %#x\n", hr); + check_storage_contents(doc, &pdata->stg_def, &enumerated_streams, &matched_streams); ok(enumerated_streams == matched_streams, "enumerated %d != matched %d\n", enumerated_streams, matched_streams); -- 2.12.0

1 0

[PATCH 1/2] ole32: Remove unused variable.
by Huw Davies 08 Dec '17

08 Dec '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/datacache.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index b418301276..6a13485339 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1842,23 +1842,11 @@ static HRESULT WINAPI DataCache_Save( { DataCache *This = impl_from_IPersistStorage(iface); DataCacheEntry *cache_entry; - BOOL dirty = FALSE; HRESULT hr = S_OK; unsigned short stream_number = 0; TRACE("(%p, %p, %d)\n", iface, pStg, fSameAsLoad); - dirty = This->dirty; - if (!dirty) - { - LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) - { - dirty = cache_entry->dirty; - if (dirty) - break; - } - } - /* assign stream numbers to the cache entries */ LIST_FOR_EACH_ENTRY(cache_entry, &This->cache_list, DataCacheEntry, entry) { -- 2.12.0

1 0

[PATCH 4/4] ole32: Properly align HMETAFILEPICT marshal data.
by Huw Davies 08 Dec '17

08 Dec '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/tests/usrmarshal.c | 26 ++++++++++++++------------ dlls/ole32/usrmarshal.c | 10 +++++++--- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 7ab23ad8c4..3919395800 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -502,12 +502,12 @@ static void test_marshal_HMETAFILEPICT(void) GlobalUnlock(hmfp); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); - size = HMETAFILEPICT_UserSize(&umcb.Flags, 0, &hmfp); - ok(size > 20, "size should be at least 20 bytes, not %d\n", size); + size = HMETAFILEPICT_UserSize(&umcb.Flags, 1, &hmfp); + ok(size > 24, "size should be at least 24 bytes, not %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - buffer_end = HMETAFILEPICT_UserMarshal(&umcb.Flags, buffer, &hmfp); - wirehmfp = buffer; + buffer_end = HMETAFILEPICT_UserMarshal(&umcb.Flags, buffer + 1, &hmfp); + wirehmfp = buffer + 4; ok(*(DWORD *)wirehmfp == WDT_REMOTE_CALL, "wirestgm + 0x0 should be WDT_REMOTE_CALL instead of 0x%08x\n", *(DWORD *)wirehmfp); wirehmfp += sizeof(DWORD); ok(*(DWORD *)wirehmfp == (DWORD)(DWORD_PTR)hmfp, "wirestgm + 0x4 should be hmf instead of 0x%08x\n", *(DWORD *)wirehmfp); @@ -528,16 +528,16 @@ static void test_marshal_HMETAFILEPICT(void) wirehmfp += sizeof(DWORD); /* Note use (buffer_end - buffer) instead of size here, because size is an * overestimate with native */ - ok(*(DWORD *)wirehmfp == (buffer_end - buffer - 0x28), "wirestgm + 0x20 should be size - 0x34 instead of 0x%08x\n", *(DWORD *)wirehmfp); + ok(*(DWORD *)wirehmfp == (buffer_end - buffer - 0x2c), "wirestgm + 0x20 should be size - 0x34 instead of 0x%08x\n", *(DWORD *)wirehmfp); wirehmfp += sizeof(DWORD); - ok(*(DWORD *)wirehmfp == (buffer_end - buffer - 0x28), "wirestgm + 0x24 should be size - 0x34 instead of 0x%08x\n", *(DWORD *)wirehmfp); + ok(*(DWORD *)wirehmfp == (buffer_end - buffer - 0x2c), "wirestgm + 0x24 should be size - 0x34 instead of 0x%08x\n", *(DWORD *)wirehmfp); wirehmfp += sizeof(DWORD); ok(*(WORD *)wirehmfp == 1, "wirehmfp + 0x28 should be 1 instead of 0x%08x\n", *(DWORD *)wirehmfp); /* ... rest of data not tested - refer to tests for GetMetaFileBits * at this point */ init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - HMETAFILEPICT_UserUnmarshal(&umcb.Flags, buffer, &hmfp2); + HMETAFILEPICT_UserUnmarshal(&umcb.Flags, buffer + 1, &hmfp2); ok(hmfp2 != NULL, "HMETAFILEPICT didn't unmarshal\n"); HeapFree(GetProcessHeap(), 0, buffer); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); @@ -551,12 +551,13 @@ static void test_marshal_HMETAFILEPICT(void) hmfp = NULL; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); - size = HMETAFILEPICT_UserSize(&umcb.Flags, 0, &hmfp); - ok(size == 8, "size should be 8 bytes, not %d\n", size); + size = HMETAFILEPICT_UserSize(&umcb.Flags, 1, &hmfp); + ok(size == 12, "size should be 12 bytes, not %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - HMETAFILEPICT_UserMarshal(&umcb.Flags, buffer, &hmfp); - wirehmfp = buffer; + buffer_end = HMETAFILEPICT_UserMarshal(&umcb.Flags, buffer + 1, &hmfp); + ok(buffer_end == buffer + size, "got %p buffer %p\n", buffer_end, buffer); + wirehmfp = buffer + 4; ok(*(DWORD *)wirehmfp == WDT_REMOTE_CALL, "wirestgm + 0x0 should be WDT_REMOTE_CALL instead of 0x%08x\n", *(DWORD *)wirehmfp); wirehmfp += sizeof(DWORD); ok(*(DWORD *)wirehmfp == (DWORD)(DWORD_PTR)hmfp, "wirestgm + 0x4 should be hmf instead of 0x%08x\n", *(DWORD *)wirehmfp); @@ -564,7 +565,8 @@ static void test_marshal_HMETAFILEPICT(void) hmfp2 = NULL; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - HMETAFILEPICT_UserUnmarshal(&umcb.Flags, buffer, &hmfp2); + buffer_end = HMETAFILEPICT_UserUnmarshal(&umcb.Flags, buffer + 1, &hmfp2); + ok(buffer_end == buffer + size, "got %p buffer %p\n", buffer_end, buffer); ok(hmfp2 == NULL, "NULL HMETAFILE didn't unmarshal\n"); HeapFree(GetProcessHeap(), 0, buffer); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index d773684627..63eead1b84 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -1291,11 +1291,11 @@ void __RPC_USER HENHMETAFILE_UserFree(ULONG *pFlags, HENHMETAFILE *phEmf) * the first parameter is a ULONG. * This function is only intended to be called by the RPC runtime. */ -ULONG __RPC_USER HMETAFILEPICT_UserSize(ULONG *pFlags, ULONG StartingSize, HMETAFILEPICT *phMfp) +ULONG __RPC_USER HMETAFILEPICT_UserSize(ULONG *pFlags, ULONG size, HMETAFILEPICT *phMfp) { - ULONG size = StartingSize; + TRACE("(%s, %d, &%p)\n", debugstr_user_flags(pFlags), size, *phMfp); - TRACE("(%s, %d, &%p)\n", debugstr_user_flags(pFlags), StartingSize, *phMfp); + ALIGN_LENGTH(size, 3); size += sizeof(ULONG); @@ -1345,6 +1345,8 @@ unsigned char * __RPC_USER HMETAFILEPICT_UserMarshal(ULONG *pFlags, unsigned cha { TRACE("(%s, %p, &%p)\n", debugstr_user_flags(pFlags), pBuffer, *phMfp); + ALIGN_POINTER(pBuffer, 3); + if (LOWORD(*pFlags) == MSHCTX_INPROC) { if (sizeof(HMETAFILEPICT) == 8) @@ -1408,6 +1410,8 @@ unsigned char * __RPC_USER HMETAFILEPICT_UserUnmarshal(ULONG *pFlags, unsigned c TRACE("(%s, %p, %p)\n", debugstr_user_flags(pFlags), pBuffer, phMfp); + ALIGN_POINTER(pBuffer, 3); + fContext = *(ULONG *)pBuffer; pBuffer += sizeof(ULONG); -- 2.12.0

1 0

[PATCH 3/4] ole32: Properly align HENHMETAFILE marshal data.
by Huw Davies 08 Dec '17

08 Dec '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/tests/usrmarshal.c | 30 +++++++++++++++++------------- dlls/ole32/usrmarshal.c | 10 +++++++--- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index ed28861ad1..7ab23ad8c4 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -347,7 +347,7 @@ static void test_marshal_HENHMETAFILE(void) USER_MARSHAL_CB umcb; MIDL_STUB_MESSAGE stub_msg; RPC_MESSAGE rpc_msg; - unsigned char *buffer; + unsigned char *buffer, *buffer_end; ULONG size; HENHMETAFILE hemf; HENHMETAFILE hemf2 = NULL; @@ -356,26 +356,28 @@ static void test_marshal_HENHMETAFILE(void) hemf = create_emf(); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); - size = HENHMETAFILE_UserSize(&umcb.Flags, 0, &hemf); - ok(size > 20, "size should be at least 20 bytes, not %d\n", size); + size = HENHMETAFILE_UserSize(&umcb.Flags, 1, &hemf); + ok(size > 24, "size should be at least 24 bytes, not %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - HENHMETAFILE_UserMarshal(&umcb.Flags, buffer, &hemf); - wirehemf = buffer; + buffer_end = HENHMETAFILE_UserMarshal(&umcb.Flags, buffer + 1, &hemf); + ok(buffer_end == buffer + size, "got %p buffer %p\n", buffer_end, buffer); + wirehemf = buffer + 4; ok(*(DWORD *)wirehemf == WDT_REMOTE_CALL, "wirestgm + 0x0 should be WDT_REMOTE_CALL instead of 0x%08x\n", *(DWORD *)wirehemf); wirehemf += sizeof(DWORD); ok(*(DWORD *)wirehemf == (DWORD)(DWORD_PTR)hemf, "wirestgm + 0x4 should be hemf instead of 0x%08x\n", *(DWORD *)wirehemf); wirehemf += sizeof(DWORD); - ok(*(DWORD *)wirehemf == (size - 0x10), "wirestgm + 0x8 should be size - 0x10 instead of 0x%08x\n", *(DWORD *)wirehemf); + ok(*(DWORD *)wirehemf == (size - 0x14), "wirestgm + 0x8 should be size - 0x14 instead of 0x%08x\n", *(DWORD *)wirehemf); wirehemf += sizeof(DWORD); - ok(*(DWORD *)wirehemf == (size - 0x10), "wirestgm + 0xc should be size - 0x10 instead of 0x%08x\n", *(DWORD *)wirehemf); + ok(*(DWORD *)wirehemf == (size - 0x14), "wirestgm + 0xc should be size - 0x14 instead of 0x%08x\n", *(DWORD *)wirehemf); wirehemf += sizeof(DWORD); ok(*(DWORD *)wirehemf == EMR_HEADER, "wirestgm + 0x10 should be EMR_HEADER instead of %d\n", *(DWORD *)wirehemf); /* ... rest of data not tested - refer to tests for GetEnhMetaFileBits * at this point */ init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - HENHMETAFILE_UserUnmarshal(&umcb.Flags, buffer, &hemf2); + buffer_end = HENHMETAFILE_UserUnmarshal(&umcb.Flags, buffer + 1, &hemf2); + ok(buffer_end == buffer + size, "got %p buffer %p\n", buffer_end, buffer); ok(hemf2 != NULL, "HENHMETAFILE didn't unmarshal\n"); HeapFree(GetProcessHeap(), 0, buffer); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); @@ -386,18 +388,20 @@ static void test_marshal_HENHMETAFILE(void) hemf = NULL; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); - size = HENHMETAFILE_UserSize(&umcb.Flags, 0, &hemf); - ok(size == 8, "size should be 8 bytes, not %d\n", size); + size = HENHMETAFILE_UserSize(&umcb.Flags, 1, &hemf); + ok(size == 12, "size should be 12 bytes, not %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - HENHMETAFILE_UserMarshal(&umcb.Flags, buffer, &hemf); - wirehemf = buffer; + buffer_end = HENHMETAFILE_UserMarshal(&umcb.Flags, buffer + 1, &hemf); + ok(buffer_end == buffer + size, "got %p buffer %p\n", buffer_end, buffer); + wirehemf = buffer + 4; ok(*(DWORD *)wirehemf == WDT_REMOTE_CALL, "wirestgm + 0x0 should be WDT_REMOTE_CALL instead of 0x%08x\n", *(DWORD *)wirehemf); wirehemf += sizeof(DWORD); ok(*(DWORD *)wirehemf == (DWORD)(DWORD_PTR)hemf, "wirestgm + 0x4 should be hemf instead of 0x%08x\n", *(DWORD *)wirehemf); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - HENHMETAFILE_UserUnmarshal(&umcb.Flags, buffer, &hemf2); + buffer_end = HENHMETAFILE_UserUnmarshal(&umcb.Flags, buffer + 1, &hemf2); + ok(buffer_end == buffer + size, "got %p buffer %p\n", buffer_end, buffer); ok(hemf2 == NULL, "NULL HENHMETAFILE didn't unmarshal\n"); HeapFree(GetProcessHeap(), 0, buffer); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index ff961a2f2d..d773684627 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -1095,11 +1095,11 @@ void __RPC_USER HMETAFILE_UserFree(ULONG *pFlags, HMETAFILE *phmf) * the first parameter is a ULONG. * This function is only intended to be called by the RPC runtime. */ -ULONG __RPC_USER HENHMETAFILE_UserSize(ULONG *pFlags, ULONG StartingSize, HENHMETAFILE *phEmf) +ULONG __RPC_USER HENHMETAFILE_UserSize(ULONG *pFlags, ULONG size, HENHMETAFILE *phEmf) { - ULONG size = StartingSize; + TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), size, *phEmf); - TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), StartingSize, *phEmf); + ALIGN_LENGTH(size, 3); size += sizeof(ULONG); if (LOWORD(*pFlags) == MSHCTX_INPROC) @@ -1144,6 +1144,8 @@ unsigned char * __RPC_USER HENHMETAFILE_UserMarshal(ULONG *pFlags, unsigned char { TRACE("(%s, %p, &%p\n", debugstr_user_flags(pFlags), pBuffer, *phEmf); + ALIGN_POINTER(pBuffer, 3); + if (LOWORD(*pFlags) == MSHCTX_INPROC) { if (sizeof(*phEmf) == 8) @@ -1202,6 +1204,8 @@ unsigned char * __RPC_USER HENHMETAFILE_UserUnmarshal(ULONG *pFlags, unsigned ch TRACE("(%s, %p, %p\n", debugstr_user_flags(pFlags), pBuffer, phEmf); + ALIGN_POINTER(pBuffer, 3); + fContext = *(ULONG *)pBuffer; pBuffer += sizeof(ULONG); -- 2.12.0

1 0

[PATCH 2/4] ole32: Properly align HANDLE marshal data.
by Huw Davies 08 Dec '17

08 Dec '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/tests/usrmarshal.c | 56 ++++++++++++++++++++++++------------------- dlls/ole32/usrmarshal.c | 12 ++++++++-- 2 files changed, 42 insertions(+), 26 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index cff3ae5f12..ed28861ad1 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -225,25 +225,27 @@ static void test_marshal_HWND(void) USER_MARSHAL_CB umcb; MIDL_STUB_MESSAGE stub_msg; RPC_MESSAGE rpc_msg; - unsigned char *buffer; + unsigned char *buffer, *buffer_end; ULONG size; HWND hwnd = GetDesktopWindow(); HWND hwnd2; wireHWND wirehwnd; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); - size = HWND_UserSize(&umcb.Flags, 0, &hwnd); - ok(size == sizeof(*wirehwnd), "Wrong size %d\n", size); + size = HWND_UserSize(&umcb.Flags, 1, &hwnd); + ok(size == 4 + sizeof(*wirehwnd), "Wrong size %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); - HWND_UserMarshal(&umcb.Flags, buffer, &hwnd); - wirehwnd = (wireHWND)buffer; + buffer_end = HWND_UserMarshal(&umcb.Flags, buffer + 1, &hwnd); + ok(buffer_end == buffer + size, "got %p buffer %p\n", buffer_end, buffer); + wirehwnd = (wireHWND)(buffer + 4); ok(wirehwnd->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehwnd->fContext); ok(wirehwnd->u.hInproc == (LONG_PTR)hwnd, "Marshaled value should be %p instead of %x\n", hwnd, wirehwnd->u.hRemote); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); - HWND_UserUnmarshal(&umcb.Flags, buffer, &hwnd2); + buffer_end = HWND_UserUnmarshal(&umcb.Flags, buffer + 1, &hwnd2); + ok(buffer_end == buffer + size, "got %p buffer %p\n", buffer_end, buffer); ok(hwnd == hwnd2, "Didn't unmarshal properly\n"); HeapFree(GetProcessHeap(), 0, buffer); @@ -1092,23 +1094,25 @@ static void test_marshal_HDC(void) HDC hdc = GetDC(0), hdc2; USER_MARSHAL_CB umcb; RPC_MESSAGE rpc_msg; - unsigned char *buffer; + unsigned char *buffer, *buffer_end; wireHDC wirehdc; ULONG size; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); - size = HDC_UserSize(&umcb.Flags, 0, &hdc); - ok(size == sizeof(*wirehdc), "Wrong size %d\n", size); + size = HDC_UserSize(&umcb.Flags, 1, &hdc); + ok(size == 4 + sizeof(*wirehdc), "Wrong size %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); - HDC_UserMarshal(&umcb.Flags, buffer, &hdc); - wirehdc = (wireHDC)buffer; + buffer_end = HDC_UserMarshal(&umcb.Flags, buffer + 1, &hdc); + ok(buffer_end == buffer + 4 + sizeof(*wirehdc), "got %p buffer %p\n", buffer_end, buffer); + wirehdc = (wireHDC)(buffer + 4); ok(wirehdc->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehdc->fContext); ok(wirehdc->u.hInproc == (LONG_PTR)hdc, "Marshaled value should be %p instead of %x\n", hdc, wirehdc->u.hRemote); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); - HDC_UserUnmarshal(&umcb.Flags, buffer, &hdc2); + buffer_end = HDC_UserUnmarshal(&umcb.Flags, buffer + 1, &hdc2); + ok(buffer_end == buffer + 4 + sizeof(*wirehdc), "got %p buffer %p\n", buffer_end, buffer); ok(hdc == hdc2, "Didn't unmarshal properly\n"); HeapFree(GetProcessHeap(), 0, buffer); @@ -1124,7 +1128,7 @@ static void test_marshal_HICON(void) HICON hIcon, hIcon2; USER_MARSHAL_CB umcb; RPC_MESSAGE rpc_msg; - unsigned char *buffer; + unsigned char *buffer, *buffer_end; wireHICON wirehicon; ULONG size; @@ -1132,18 +1136,20 @@ static void test_marshal_HICON(void) ok(hIcon != 0, "CreateIcon failed\n"); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); - size = HICON_UserSize(&umcb.Flags, 0, &hIcon); - ok(size == sizeof(*wirehicon), "Wrong size %d\n", size); + size = HICON_UserSize(&umcb.Flags, 1, &hIcon); + ok(size == 4 + sizeof(*wirehicon), "Wrong size %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); - HICON_UserMarshal(&umcb.Flags, buffer, &hIcon); - wirehicon = (wireHICON)buffer; + buffer_end = HICON_UserMarshal(&umcb.Flags, buffer + 1, &hIcon); + ok(buffer_end == buffer + 4 + sizeof(*wirehicon), "got %p buffer %p\n", buffer_end, buffer); + wirehicon = (wireHICON)(buffer + 4); ok(wirehicon->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehicon->fContext); ok(wirehicon->u.hInproc == (LONG_PTR)hIcon, "Marshaled value should be %p instead of %x\n", hIcon, wirehicon->u.hRemote); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); - HICON_UserUnmarshal(&umcb.Flags, buffer, &hIcon2); + buffer_end = HICON_UserUnmarshal(&umcb.Flags, buffer + 1, &hIcon2); + ok(buffer_end == buffer + 4 + sizeof(*wirehicon), "got %p buffer %p\n", buffer_end, buffer); ok(hIcon == hIcon2, "Didn't unmarshal properly\n"); HeapFree(GetProcessHeap(), 0, buffer); @@ -1158,7 +1164,7 @@ static void test_marshal_HBRUSH(void) HBRUSH hBrush, hBrush2; USER_MARSHAL_CB umcb; RPC_MESSAGE rpc_msg; - unsigned char *buffer; + unsigned char *buffer, *buffer_end; LOGBRUSH logbrush; wireHBRUSH wirehbrush; ULONG size; @@ -1171,18 +1177,20 @@ static void test_marshal_HBRUSH(void) ok(hBrush != 0, "CreateBrushIndirect failed\n"); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); - size = HBRUSH_UserSize(&umcb.Flags, 0, &hBrush); - ok(size == sizeof(*wirehbrush), "Wrong size %d\n", size); + size = HBRUSH_UserSize(&umcb.Flags, 1, &hBrush); + ok(size == 4 + sizeof(*wirehbrush), "Wrong size %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); - HBRUSH_UserMarshal(&umcb.Flags, buffer, &hBrush); - wirehbrush = (wireHBRUSH)buffer; + buffer_end = HBRUSH_UserMarshal(&umcb.Flags, buffer + 1, &hBrush); + ok(buffer_end == buffer + 4 + sizeof(*wirehbrush), "got %p buffer %p\n", buffer_end, buffer); + wirehbrush = (wireHBRUSH)(buffer + 4); ok(wirehbrush->fContext == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", wirehbrush->fContext); ok(wirehbrush->u.hInproc == (LONG_PTR)hBrush, "Marshaled value should be %p instead of %x\n", hBrush, wirehbrush->u.hRemote); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); - HBRUSH_UserUnmarshal(&umcb.Flags, buffer, &hBrush2); + buffer_end = HBRUSH_UserUnmarshal(&umcb.Flags, buffer + 1, &hBrush2); + ok(buffer_end == buffer + 4 + sizeof(*wirehbrush), "got %p buffer %p\n", buffer_end, buffer); ok(hBrush == hBrush2, "Didn't unmarshal properly\n"); HeapFree(GetProcessHeap(), 0, buffer); diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 4ebf7f823d..ff961a2f2d 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -286,18 +286,23 @@ static ULONG handle_UserSize(ULONG *pFlags, ULONG StartingSize, HANDLE *handle) RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); return StartingSize; } + + ALIGN_LENGTH(StartingSize, 3); return StartingSize + sizeof(RemotableHandle); } static unsigned char * handle_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle) { - RemotableHandle *remhandle = (RemotableHandle *)pBuffer; + RemotableHandle *remhandle; if (LOWORD(*pFlags) == MSHCTX_DIFFERENTMACHINE) { ERR("can't remote a local handle\n"); RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); return pBuffer; } + + ALIGN_POINTER(pBuffer, 3); + remhandle = (RemotableHandle *)pBuffer; remhandle->fContext = WDT_INPROC_CALL; remhandle->u.hInproc = (LONG_PTR)*handle; return pBuffer + sizeof(RemotableHandle); @@ -305,7 +310,10 @@ static unsigned char * handle_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, static unsigned char * handle_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle) { - RemotableHandle *remhandle = (RemotableHandle *)pBuffer; + RemotableHandle *remhandle; + + ALIGN_POINTER(pBuffer, 3); + remhandle = (RemotableHandle *)pBuffer; if (remhandle->fContext != WDT_INPROC_CALL) RaiseException(RPC_X_BAD_STUB_DATA, 0, 0, NULL); *handle = (HANDLE)(LONG_PTR)remhandle->u.hInproc; -- 2.12.0

1 0

[PATCH 1/4] ole32: Properly align CLIPFORMAT marshal data.
by Huw Davies 08 Dec '17

08 Dec '17

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/tests/usrmarshal.c | 25 +++++++++++++------------ dlls/ole32/usrmarshal.c | 10 +++++++--- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 839ade07eb..cff3ae5f12 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -187,31 +187,32 @@ static void test_marshal_CLIPFORMAT(void) USER_MARSHAL_CB umcb; MIDL_STUB_MESSAGE stub_msg; RPC_MESSAGE rpc_msg; - unsigned char *buffer; + unsigned char *buffer, *buffer_end; ULONG i, size; CLIPFORMAT cf = RegisterClipboardFormatA("MyFormat"); CLIPFORMAT cf2; init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_DIFFERENTMACHINE); - size = CLIPFORMAT_UserSize(&umcb.Flags, 0, &cf); - ok(size == 8 + sizeof(cf_marshaled) || - broken(size == 12 + sizeof(cf_marshaled)) || /* win64 adds 4 extra (unused) bytes */ - broken(size == 8 + sizeof(cf_marshaled) - 2), /* win9x and winnt don't include the '\0' */ + size = CLIPFORMAT_UserSize(&umcb.Flags, 1, &cf); + ok(size == 12 + sizeof(cf_marshaled) || + broken(size == 16 + sizeof(cf_marshaled)), /* win64 adds 4 extra (unused) bytes */ "CLIPFORMAT: Wrong size %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); memset( buffer, 0xcc, size ); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - CLIPFORMAT_UserMarshal(&umcb.Flags, buffer, &cf); - ok(*(LONG *)(buffer + 0) == WDT_REMOTE_CALL, "CLIPFORMAT: Context should be WDT_REMOTE_CALL instead of 0x%08x\n", *(LONG *)(buffer + 0)); - ok(*(DWORD *)(buffer + 4) == cf, "CLIPFORMAT: Marshaled value should be 0x%04x instead of 0x%04x\n", cf, *(DWORD *)(buffer + 4)); - ok(!memcmp(buffer + 8, cf_marshaled, min( sizeof(cf_marshaled), size-8 )), "Marshaled data differs\n"); - if (size > sizeof(cf_marshaled) + 8) /* make sure the extra bytes are not used */ - for (i = sizeof(cf_marshaled) + 8; i < size; i++) + buffer_end = CLIPFORMAT_UserMarshal(&umcb.Flags, buffer + 1, &cf); + ok(buffer_end == buffer + 12 + sizeof(cf_marshaled), "got %p buffer %p\n", buffer_end, buffer); + ok(*(LONG *)(buffer + 4) == WDT_REMOTE_CALL, "CLIPFORMAT: Context should be WDT_REMOTE_CALL instead of 0x%08x\n", *(LONG *)(buffer + 0)); + ok(*(DWORD *)(buffer + 8) == cf, "CLIPFORMAT: Marshaled value should be 0x%04x instead of 0x%04x\n", cf, *(DWORD *)(buffer + 4)); + ok(!memcmp(buffer + 12, cf_marshaled, min( sizeof(cf_marshaled), size-12 )), "Marshaled data differs\n"); + if (size > sizeof(cf_marshaled) + 12) /* make sure the extra bytes are not used */ + for (i = sizeof(cf_marshaled) + 12; i < size; i++) ok( buffer[i] == 0xcc, "buffer offset %u has been set to %x\n", i, buffer[i] ); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_DIFFERENTMACHINE); - CLIPFORMAT_UserUnmarshal(&umcb.Flags, buffer, &cf2); + buffer_end = CLIPFORMAT_UserUnmarshal(&umcb.Flags, buffer + 1, &cf2); + ok(buffer_end == buffer + 12 + sizeof(cf_marshaled), "got %p buffer %p\n", buffer_end, buffer); ok(cf == cf2, "CLIPFORMAT: Didn't unmarshal properly\n"); HeapFree(GetProcessHeap(), 0, buffer); diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 6efd99e390..4ebf7f823d 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -98,11 +98,11 @@ static const char* debugstr_user_flags(ULONG *pFlags) * the first parameter is an unsigned long. * This function is only intended to be called by the RPC runtime. */ -ULONG __RPC_USER CLIPFORMAT_UserSize(ULONG *pFlags, ULONG StartingSize, CLIPFORMAT *pCF) +ULONG __RPC_USER CLIPFORMAT_UserSize(ULONG *pFlags, ULONG size, CLIPFORMAT *pCF) { - ULONG size = StartingSize; + TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), size, pCF); - TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), StartingSize, pCF); + ALIGN_LENGTH(size, 3); size += 8; @@ -147,6 +147,8 @@ unsigned char * __RPC_USER CLIPFORMAT_UserMarshal(ULONG *pFlags, unsigned char * { TRACE("(%s, %p, &0x%04x\n", debugstr_user_flags(pFlags), pBuffer, *pCF); + ALIGN_POINTER(pBuffer, 3); + /* only need to marshal the name if it is not a pre-defined type and * we are going remote */ if ((*pCF >= 0xc000) && (LOWORD(*pFlags) == MSHCTX_DIFFERENTMACHINE)) @@ -209,6 +211,8 @@ unsigned char * __RPC_USER CLIPFORMAT_UserUnmarshal(ULONG *pFlags, unsigned char TRACE("(%s, %p, %p\n", debugstr_user_flags(pFlags), pBuffer, pCF); + ALIGN_POINTER(pBuffer, 3); + fContext = *(DWORD *)pBuffer; pBuffer += 4; -- 2.12.0

1 0

[PATCH 1/3] winemac: Check the display link running state as well as the window count to decide whether to start/stop it.
by Ken Thomases 08 Dec '17

08 Dec '17

The display link may be stopped even if there are associated windows, due to idleness. So, it may need to be started when a window is added even if it's not the first window. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> --- dlls/winemac.drv/cocoa_window.m | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index 65dc392..1b1d171 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -218,25 +218,25 @@ - (void) dealloc - (void) addWindow:(WineWindow*)window { - BOOL needsStart; + BOOL firstWindow; @synchronized(self) { - needsStart = !_windows.count; + firstWindow = !_windows.count; [_windows addObject:window]; } - if (needsStart) + if (firstWindow || !CVDisplayLinkIsRunning(_link)) CVDisplayLinkStart(_link); } - (void) removeWindow:(WineWindow*)window { - BOOL shouldStop = FALSE; + BOOL lastWindow = FALSE; @synchronized(self) { - BOOL wasRunning = _windows.count > 0; + BOOL hadWindows = _windows.count > 0; [_windows removeObject:window]; - if (wasRunning && !_windows.count) - shouldStop = TRUE; + if (hadWindows && !_windows.count) + lastWindow = TRUE; } - if (shouldStop) + if (lastWindow && CVDisplayLinkIsRunning(_link)) CVDisplayLinkStop(_link); } -- 2.10.2

1 2

[PATCH v2 1/3] ole32: Add in-process user marshalling for bitmaps.
by Zebediah Figura 08 Dec '17

08 Dec '17

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ole32/tests/usrmarshal.c | 34 +++++++++++++++++++++++++++++ dlls/ole32/usrmarshal.c | 51 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 76 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 529ad757c6..aaf3556abd 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -1190,6 +1190,39 @@ static void test_marshal_HBRUSH(void) DeleteObject(hBrush); } +static void test_marshal_HBITMAP(void) +{ + static BYTE bmp_bits[1024]; + MIDL_STUB_MESSAGE stub_msg; + HBITMAP hBitmap, hBitmap2; + USER_MARSHAL_CB umcb; + RPC_MESSAGE rpc_msg; + unsigned char *buffer, *buffer_end; + ULONG size; + + hBitmap = CreateBitmap(16, 16, 1, 1, bmp_bits); + ok(hBitmap != 0, "CreateBitmap failed\n"); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC); + size = HBITMAP_UserSize(&umcb.Flags, 1, &hBitmap); + ok(size == 0xc, "Wrong size %d\n", size); + buffer = HeapAlloc(GetProcessHeap(), 0, size + 4); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_INPROC); + buffer_end = HBITMAP_UserMarshal(&umcb.Flags, buffer + 1, &hBitmap); + ok(buffer_end == buffer + 0xc, "HBITMAP_UserMarshal() returned wrong size %d\n", (LONG)(buffer_end - buffer)); + ok(*(ULONG *)(buffer + 0x4) == WDT_INPROC_CALL, "Context should be WDT_INPROC_CALL instead of 0x%08x\n", *(ULONG *)(buffer + 0x4)); + ok(*(ULONG *)(buffer + 0x8) == (ULONG)(ULONG_PTR)hBitmap, "wirestgm + 0x4 should be bitmap handle instead of 0x%08x\n", *(ULONG *)(buffer + 0x8)); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_INPROC); + HBITMAP_UserUnmarshal(&umcb.Flags, buffer + 1, &hBitmap2); + ok(hBitmap2 != NULL, "Didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC); + HBITMAP_UserFree(&umcb.Flags, &hBitmap2); + DeleteObject(hBitmap); +} + struct obj { IDataObject IDataObject_iface; @@ -1353,6 +1386,7 @@ START_TEST(usrmarshal) test_marshal_HDC(); test_marshal_HICON(); test_marshal_HBRUSH(); + test_marshal_HBITMAP(); test_GetDataHere_Proxy(); diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 89d0675f48..696b243043 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -584,10 +584,17 @@ void __RPC_USER HGLOBAL_UserFree(ULONG *pFlags, HGLOBAL *phGlobal) * the first parameter is a ULONG. * This function is only intended to be called by the RPC runtime. */ -ULONG __RPC_USER HBITMAP_UserSize(ULONG *pFlags, ULONG StartingSize, HBITMAP *phBmp) +ULONG __RPC_USER HBITMAP_UserSize(ULONG *flags, ULONG size, HBITMAP *bmp) { - FIXME(":stub\n"); - return StartingSize; + TRACE("(%s, %d, %p)\n", debugstr_user_flags(flags), size, *bmp); + + ALIGN_LENGTH(size, 3); + + size += sizeof(ULONG); + if (LOWORD(*flags) == MSHCTX_INPROC) + size += sizeof(ULONG); + + return size; } /****************************************************************************** @@ -609,10 +616,20 @@ ULONG __RPC_USER HBITMAP_UserSize(ULONG *pFlags, ULONG StartingSize, HBITMAP *ph * the first parameter is a ULONG. * This function is only intended to be called by the RPC runtime. */ -unsigned char * __RPC_USER HBITMAP_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HBITMAP *phBmp) +unsigned char * __RPC_USER HBITMAP_UserMarshal(ULONG *flags, unsigned char *buffer, HBITMAP *bmp) { - FIXME(":stub\n"); - return pBuffer; + TRACE("(%s, %p, %p)\n", debugstr_user_flags(flags), buffer, *bmp); + + ALIGN_POINTER(buffer, 3); + + if (LOWORD(*flags) == MSHCTX_INPROC) + { + *(ULONG *)buffer = WDT_INPROC_CALL; + buffer += sizeof(ULONG); + *(ULONG *)buffer = (ULONG)(ULONG_PTR)*bmp; + buffer += sizeof(ULONG); + } + return buffer; } /****************************************************************************** @@ -634,10 +651,26 @@ unsigned char * __RPC_USER HBITMAP_UserMarshal(ULONG *pFlags, unsigned char *pBu * the first parameter is an ULONG. * This function is only intended to be called by the RPC runtime. */ -unsigned char * __RPC_USER HBITMAP_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HBITMAP *phBmp) +unsigned char * __RPC_USER HBITMAP_UserUnmarshal(ULONG *flags, unsigned char *buffer, HBITMAP *bmp) { - FIXME(":stub\n"); - return pBuffer; + ULONG context; + + TRACE("(%s, %p, %p)\n", debugstr_user_flags(flags), buffer, bmp); + + ALIGN_POINTER(buffer, 3); + + context = *(ULONG *)buffer; + buffer += sizeof(ULONG); + + if (context == WDT_INPROC_CALL) + { + *bmp = *(HBITMAP *)buffer; + buffer += sizeof(*bmp); + } + else + RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); + + return buffer; } /****************************************************************************** -- 2.15.1

2 5

[PATCH 1/5] ole32: Refactor OLE's data cache Save implementation.
by Sergio Gómez Del Real 08 Dec '17

08 Dec '17

Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> --- dlls/ole32/datacache.c | 239 ++++++++++++++++++++++++------------------------- 1 file changed, 119 insertions(+), 120 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index c550c75cd3..f46f71215d 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -775,16 +775,118 @@ static HRESULT DataCacheEntry_LoadData(DataCacheEntry *cache_entry) return hr; } -static HRESULT DataCacheEntry_CreateStream(DataCacheEntry *cache_entry, - IStorage *storage, IStream **stream) +static void init_stream_header(DataCacheEntry *entry, PresentationDataHeader *header) { - WCHAR wszName[] = {2,'O','l','e','P','r','e','s', + if (entry->fmtetc.ptd) + FIXME("ptd not serialized\n"); + header->tdSize = sizeof(header->tdSize); + header->dvAspect = entry->fmtetc.dwAspect; + header->lindex = entry->fmtetc.lindex; + header->advf = entry->advise_flags; + header->unknown7 = 0; + header->dwObjectExtentX = 0; + header->dwObjectExtentY = 0; + header->dwSize = 0; +} + +static HRESULT save_dib(DataCacheEntry *entry, BOOL contents, IStream *stream) +{ + HRESULT hr = S_OK; + int data_size = GlobalSize(entry->stgmedium.u.hGlobal); + BITMAPINFO *bmi = GlobalLock(entry->stgmedium.u.hGlobal); + + if (!contents) + { + PresentationDataHeader header; + + init_stream_header(entry, &header); + hr = write_clipformat(stream, entry->fmtetc.cfFormat); + if (FAILED(hr)) goto end; + if (data_size) + { + header.dwSize = data_size; + /* Size in units of 0.01mm (ie. MM_HIMETRIC) */ + if (bmi->bmiHeader.biXPelsPerMeter != 0 && bmi->bmiHeader.biYPelsPerMeter != 0) + { + header.dwObjectExtentX = MulDiv(bmi->bmiHeader.biWidth, 100000, bmi->bmiHeader.biXPelsPerMeter); + header.dwObjectExtentY = MulDiv(bmi->bmiHeader.biHeight, 100000, bmi->bmiHeader.biYPelsPerMeter); + } + else + { + HDC hdc = GetDC(0); + header.dwObjectExtentX = MulDiv(bmi->bmiHeader.biWidth, 2540, GetDeviceCaps(hdc, LOGPIXELSX)); + header.dwObjectExtentY = MulDiv(bmi->bmiHeader.biHeight, 2540, GetDeviceCaps(hdc, LOGPIXELSY)); + ReleaseDC(0, hdc); + } + } + hr = IStream_Write(stream, &header, sizeof(PresentationDataHeader), NULL); + if (hr == S_OK && data_size) + hr = IStream_Write(stream, bmi, data_size, NULL); + } + +end: + if (bmi) GlobalUnlock(entry->stgmedium.u.hGlobal); + return hr; +} + +static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream) +{ + HRESULT hr = S_OK; + int data_size = 0; + void *data = NULL; + METAFILEPICT *mfpict = NULL; + + if (!contents) + { + PresentationDataHeader header; + + init_stream_header(entry, &header); + hr = write_clipformat(stream, entry->fmtetc.cfFormat); + if (FAILED(hr)) return hr; + if (entry->stgmedium.tymed != TYMED_NULL) + { + mfpict = GlobalLock(entry->stgmedium.u.hMetaFilePict); + if (!mfpict) + return DV_E_STGMEDIUM; + data_size = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); + header.dwObjectExtentX = mfpict->xExt; + header.dwObjectExtentY = mfpict->yExt; + header.dwSize = data_size; + data = HeapAlloc(GetProcessHeap(), 0, header.dwSize); + if (!data) + { + GlobalUnlock(entry->stgmedium.u.hMetaFilePict); + return E_OUTOFMEMORY; + } + GetMetaFileBitsEx(mfpict->hMF, header.dwSize, data); + GlobalUnlock(entry->stgmedium.u.hMetaFilePict); + } + hr = IStream_Write(stream, &header, sizeof(PresentationDataHeader), NULL); + if (hr == S_OK && data_size) + hr = IStream_Write(stream, data, data_size, NULL); + HeapFree(GetProcessHeap(), 0, data); + } + + return hr; +} + +static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; + +static HRESULT create_stream(DataCacheEntry *cache_entry, IStorage *storage, + BOOL contents, IStream **stream) +{ + WCHAR pres[] = {2,'O','l','e','P','r','e','s', '0' + (cache_entry->stream_number / 100) % 10, '0' + (cache_entry->stream_number / 10) % 10, '0' + cache_entry->stream_number % 10, 0}; + const WCHAR *name; - /* FIXME: cache the created stream in This? */ - return IStorage_CreateStream(storage, wszName, + if (contents) + name = CONTENTS; + else + name = pres; + + return IStorage_CreateStream(storage, name, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, stream); } @@ -792,130 +894,29 @@ static HRESULT DataCacheEntry_CreateStream(DataCacheEntry *cache_entry, static HRESULT DataCacheEntry_Save(DataCacheEntry *cache_entry, IStorage *storage, BOOL same_as_load) { - PresentationDataHeader header; HRESULT hr; - IStream *pres_stream; - void *data = NULL; + IStream *stream; + BOOL contents = (cache_entry->id == 1); TRACE("stream_number = %d, fmtetc = %s\n", cache_entry->stream_number, debugstr_formatetc(&cache_entry->fmtetc)); - hr = DataCacheEntry_CreateStream(cache_entry, storage, &pres_stream); + hr = create_stream(cache_entry, storage, contents, &stream); if (FAILED(hr)) return hr; - hr = write_clipformat(pres_stream, cache_entry->fmtetc.cfFormat); - if (FAILED(hr)) - return hr; - - if (cache_entry->fmtetc.ptd) - FIXME("ptd not serialized\n"); - header.tdSize = sizeof(header.tdSize); - header.dvAspect = cache_entry->fmtetc.dwAspect; - header.lindex = cache_entry->fmtetc.lindex; - header.advf = cache_entry->advise_flags; - header.unknown7 = 0; - header.dwObjectExtentX = 0; - header.dwObjectExtentY = 0; - header.dwSize = 0; - - /* size the data */ - switch (cache_entry->fmtetc.cfFormat) - { - case CF_METAFILEPICT: - { - if (cache_entry->stgmedium.tymed != TYMED_NULL) - { - const METAFILEPICT *mfpict = GlobalLock(cache_entry->stgmedium.u.hMetaFilePict); - if (!mfpict) - { - IStream_Release(pres_stream); - return DV_E_STGMEDIUM; - } - header.dwObjectExtentX = mfpict->xExt; - header.dwObjectExtentY = mfpict->yExt; - header.dwSize = GetMetaFileBitsEx(mfpict->hMF, 0, NULL); - GlobalUnlock(cache_entry->stgmedium.u.hMetaFilePict); - } - break; - } - case CF_DIB: - { - header.dwSize = GlobalSize(cache_entry->stgmedium.u.hGlobal); - if (header.dwSize) - { - const BITMAPINFO *bmi = GlobalLock(cache_entry->stgmedium.u.hGlobal); - /* Size in units of 0.01mm (ie. MM_HIMETRIC) */ - if (bmi->bmiHeader.biXPelsPerMeter != 0 && bmi->bmiHeader.biYPelsPerMeter != 0) - { - header.dwObjectExtentX = MulDiv( bmi->bmiHeader.biWidth, 100000, bmi->bmiHeader.biXPelsPerMeter ); - header.dwObjectExtentY = MulDiv( bmi->bmiHeader.biHeight, 100000, bmi->bmiHeader.biYPelsPerMeter ); - } - else - { - HDC hdc = GetDC(0); - header.dwObjectExtentX = MulDiv( bmi->bmiHeader.biWidth, 2540, GetDeviceCaps(hdc, LOGPIXELSX) ); - header.dwObjectExtentY = MulDiv( bmi->bmiHeader.biHeight, 2540, GetDeviceCaps(hdc, LOGPIXELSY) ); - ReleaseDC(0, hdc); - } - GlobalUnlock(cache_entry->stgmedium.u.hGlobal); - } - break; - } - default: - break; - } - - /* - * Write the header. - */ - hr = IStream_Write(pres_stream, &header, sizeof(PresentationDataHeader), - NULL); - if (FAILED(hr)) - { - IStream_Release(pres_stream); - return hr; - } - - /* get the data */ switch (cache_entry->fmtetc.cfFormat) { - case CF_METAFILEPICT: - { - if (cache_entry->stgmedium.tymed != TYMED_NULL) - { - const METAFILEPICT *mfpict = GlobalLock(cache_entry->stgmedium.u.hMetaFilePict); - if (!mfpict) - { - IStream_Release(pres_stream); - return DV_E_STGMEDIUM; - } - if (header.dwSize) - { - data = HeapAlloc(GetProcessHeap(), 0, header.dwSize); - GetMetaFileBitsEx(mfpict->hMF, header.dwSize, data); - GlobalUnlock(cache_entry->stgmedium.u.hMetaFilePict); - if (data) - { - hr = IStream_Write(pres_stream, data, header.dwSize, NULL); - HeapFree(GetProcessHeap(), 0, data); - } - } - } - break; - } - case CF_DIB: - { - data = GlobalLock(cache_entry->stgmedium.u.hGlobal); - if (header.dwSize) - hr = IStream_Write(pres_stream, data, header.dwSize, NULL); - GlobalUnlock(cache_entry->stgmedium.u.hGlobal); - break; - } - default: - break; + case CF_DIB: + hr = save_dib(cache_entry, contents, stream); + break; + case CF_METAFILEPICT: + hr = save_mfpict(cache_entry, contents, stream); + break; + default: + FIXME("got unsupported clipboard format %x\n", cache_entry->fmtetc.cfFormat); } - IStream_Release(pres_stream); + IStream_Release(stream); return hr; } @@ -1651,8 +1652,6 @@ static HRESULT parse_contents_stream( DataCache *This, IStorage *stg, IStream *s return add_cache_entry( This, fmt, 0, stm, contents_stream ); } -static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; - /************************************************************************ * DataCache_Load (IPersistStorage) * -- 2.14.1

2 9

[PATCH] bcrypt: Add support for AES encryption on macOS.
by Hans Leidekker 08 Dec '17

08 Dec '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- configure.ac | 2 +- dlls/bcrypt/bcrypt_main.c | 139 +++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 125 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 5d0f4cb6fe..fce97f85d3 100644 --- a/configure.ac +++ b/configure.ac @@ -397,7 +397,7 @@ AC_CHECK_HEADERS(\ AudioUnit/AudioComponent.h \ CL/cl.h \ Carbon/Carbon.h \ - CommonCrypto/CommonDigest.h \ + CommonCrypto/CommonCryptor.h \ CoreAudio/CoreAudio.h \ CoreServices/CoreServices.h \ DiskArbitration/DiskArbitration.h \ diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 931db2be99..765f7589be 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -21,9 +21,8 @@ #include "wine/port.h" #include <stdarg.h> -#ifdef HAVE_COMMONCRYPTO_COMMONDIGEST_H -#include <CommonCrypto/CommonDigest.h> -#include <CommonCrypto/CommonHMAC.h> +#ifdef HAVE_COMMONCRYPTO_COMMONCRYPTOR_H +#include <CommonCrypto/CommonCryptor.h> #elif defined(SONAME_LIBGNUTLS) #include <gnutls/gnutls.h> #include <gnutls/crypto.h> @@ -46,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(bcrypt); static HINSTANCE instance; -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) WINE_DECLARE_DEBUG_CHANNEL(winediag); static void *libgnutls_handle; @@ -121,7 +120,7 @@ static void gnutls_uninitialize(void) wine_dlclose( libgnutls_handle, NULL, 0 ); libgnutls_handle = NULL; } -#endif /* HAVE_GNUTLS_CIPHER_INIT && !HAVE_COMMONCRYPTO_COMMONDIGEST_H */ +#endif /* HAVE_GNUTLS_CIPHER_INIT && !HAVE_COMMONCRYPTO_COMMONCRYPTOR_H */ NTSTATUS WINAPI BCryptEnumAlgorithms(ULONG dwAlgOperations, ULONG *pAlgCount, BCRYPT_ALGORITHM_IDENTIFIER **ppAlgList, ULONG dwFlags) @@ -731,7 +730,16 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se return BCryptDestroyHash( handle ); } -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +static ULONG get_block_size( enum alg_id alg ) +{ + ULONG ret = 0, size = sizeof(ret); + get_alg_property( alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&ret, sizeof(ret), &size ); + return ret; +} +#endif + +#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) struct key { struct object hdr; @@ -742,13 +750,6 @@ struct key ULONG secret_len; }; -static ULONG get_block_size( enum alg_id alg ) -{ - ULONG ret = 0, size = sizeof(ret); - get_alg_property( alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&ret, sizeof(ret), &size ); - return ret; -} - static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len ) { UCHAR *buffer; @@ -858,6 +859,114 @@ static NTSTATUS key_destroy( struct key *key ) HeapFree( GetProcessHeap(), 0, key ); return STATUS_SUCCESS; } +#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) +struct key +{ + struct object hdr; + enum alg_id alg_id; + ULONG block_size; + CCCryptorRef ref_encrypt; + CCCryptorRef ref_decrypt; + UCHAR *secret; + ULONG secret_len; +}; + +static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len ) +{ + UCHAR *buffer; + + switch (id) + { + case ALG_ID_AES: + break; + + default: + FIXME( "algorithm %u not supported\n", id ); + return STATUS_NOT_SUPPORTED; + } + + if (!(key->block_size = get_block_size( id ))) return STATUS_INVALID_PARAMETER; + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, secret_len ))) return STATUS_NO_MEMORY; + memcpy( buffer, secret, secret_len ); + + key->alg_id = id; + key->ref_encrypt = NULL; /* initialized on first use */ + key->ref_decrypt = NULL; + key->secret = buffer; + key->secret_len = secret_len; + + return STATUS_SUCCESS; +} + +static NTSTATUS key_set_params( struct key *key, UCHAR *iv, ULONG iv_len ) +{ + CCCryptorStatus status; + + if (key->ref_encrypt) + { + CCCryptorRelease( key->ref_encrypt ); + key->ref_encrypt = NULL; + } + if (key->ref_decrypt) + { + CCCryptorRelease( key->ref_decrypt ); + key->ref_decrypt = NULL; + } + + if ((status = CCCryptorCreateWithMode( kCCEncrypt, kCCModeCBC, kCCAlgorithmAES, ccNoPadding, iv, + key->secret, key->secret_len, NULL, 0, 0, 0, &key->ref_encrypt )) != kCCSuccess) + { + WARN( "CCCryptorCreateWithMode failed %d\n", status ); + return STATUS_INTERNAL_ERROR; + } + if ((status = CCCryptorCreateWithMode( kCCDecrypt, kCCModeCBC, kCCAlgorithmAES, ccNoPadding, iv, + key->secret, key->secret_len, NULL, 0, 0, 0, &key->ref_decrypt )) != kCCSuccess) + { + WARN( "CCCryptorCreateWithMode failed %d\n", status ); + CCCryptorRelease( key->ref_encrypt ); + key->ref_encrypt = NULL; + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS key_encrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len ) +{ + CCCryptorStatus status; + + if ((status = CCCryptorUpdate( key->ref_encrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) + { + WARN( "CCCryptorUpdate failed %d\n", status ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS key_decrypt( struct key *key, const UCHAR *input, ULONG input_len, UCHAR *output, + ULONG output_len ) +{ + CCCryptorStatus status; + + if ((status = CCCryptorUpdate( key->ref_decrypt, input, input_len, output, output_len, NULL )) != kCCSuccess) + { + WARN( "CCCryptorUpdate failed %d\n", status ); + return STATUS_INTERNAL_ERROR; + } + + return STATUS_SUCCESS; +} + +static NTSTATUS key_destroy( struct key *key ) +{ + if (key->ref_encrypt) CCCryptorRelease( key->ref_encrypt ); + if (key->ref_decrypt) CCCryptorRelease( key->ref_decrypt ); + HeapFree( GetProcessHeap(), 0, key->secret ); + HeapFree( GetProcessHeap(), 0, key ); + return STATUS_SUCCESS; +} #else struct key { @@ -1066,14 +1175,14 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) case DLL_PROCESS_ATTACH: instance = hinst; DisableThreadLibraryCalls( hinst ); -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) gnutls_initialize(); #endif break; case DLL_PROCESS_DETACH: if (reserved) break; -#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONDIGEST_H) +#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) gnutls_uninitialize(); #endif break; -- 2.11.0

1 0

[PATCH] testbot: Minor cosmetic tweaks to the installation guide.
by Francois Gouget 08 Dec '17

08 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/doc/INSTALL.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 99471506..15b2b91b 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -42,7 +42,7 @@ General setup for the web site: cd var touch log mkdir jobs latest patches socket staging - sudo chown WWWRUN:winehq staging + sudo chown wwwrun:winehq staging chmod g+w * - Install scripts/initd in /etc/init.d/winetestbot and adjust the paths and user name if necessary. Then activate it. @@ -120,7 +120,7 @@ Dependencies: - Create a Linux VM and set it up so it can generate PE executables with MinGW. For instance on Debian you should install autoconf, bison, flex, gcc, gcc-mingw-w64, git and make. If you are going to - have 64bit VMs then make sure MinGW can generate 64bit PE executables. + have 64 bit VMs then make sure MinGW can generate 64 bit PE executables. - You may also want to install ccache. - You will also need genisoimage. - Create a new user, 'testbot' for instance, and log in as that user. -- 2.15.0

1 0

[PATCH] testbot/testagentd: Detach from the console if given the --detach option.
by Francois Gouget 08 Dec '17

08 Dec '17

This makes it possible to close the console without killing testagentd, and to start the tests from a non-minimized window. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This patch is already in use on about half of the TestBot's VMs to avoid focus issues with some of the Direct3D tests. testbot/src/testagentd/platform.h | 3 +++ testbot/src/testagentd/platform_unix.c | 15 +++++++++++++++ testbot/src/testagentd/platform_windows.c | 5 +++++ testbot/src/testagentd/testagentd.c | 11 ++++++++++- 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index ea807fb6..84ab4917 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -58,6 +58,9 @@ typedef int SOCKET; int platform_init(void); +/* Detach from the console so closing it won't kill testagentd. */ +void platform_detach_console(void); + enum run_flags_t { RUN_DNT = 1, RUN_DNTRUNC_OUT = 2, diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index b27c0165..dcd4d69b 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -328,6 +328,21 @@ void ta_freeaddrinfo(struct addrinfo *addresses) return freeaddrinfo(addresses); } +void platform_detach_console(void) +{ + pid_t pid; + + pid = fork(); + if (pid != 0) + exit(0); + + /* Daemonize */ + signal(SIGHUP, SIG_IGN); + pid = fork(); + if (pid != 0) + exit(0); +} + int platform_init(void) { struct sigaction sa, osa; diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index 70272a65..1efac1c7 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -450,6 +450,11 @@ void ta_freeaddrinfo(struct addrinfo *addresses) } } +void platform_detach_console(void) +{ + FreeConsole(); +} + int platform_init(void) { HMODULE hdll; diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index fce28b27..5f0f54ca 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -1218,6 +1218,7 @@ int main(int argc, char** argv) { const char* p; char** arg; + int opt_detach = 0; char* opt_port = NULL; char* opt_srchost = NULL; struct addrinfo *addresses, *addrp; @@ -1242,6 +1243,10 @@ int main(int argc, char** argv) { opt_debug = 1; } + else if (strcmp(*arg, "--detach") == 0) + { + opt_detach = 1; + } else if (strcmp(*arg, "--help") == 0) { opt_usage = 1; @@ -1313,7 +1318,7 @@ int main(int argc, char** argv) } if (opt_usage) { - printf("Usage: %s [--debug] [--help] PORT [SRCHOST]\n", name0); + printf("Usage: %s [--debug] [--detach] [--help] PORT [SRCHOST]\n", name0); printf("\n"); printf("Provides a simple way to send/receive files and to run scripts on this host.\n"); printf("\n"); @@ -1321,9 +1326,13 @@ int main(int argc, char** argv) printf(" PORT The port to listen on for connections.\n"); printf(" SRCHOST If specified, only connections from this host will be accepted.\n"); printf(" --debug Prints detailed information about what happens.\n"); + printf(" --detach Detach from the console / terminal. Note that on Windows you should\n"); + printf(" combine this with start: start %s --detach ...\n", name0); printf(" --help Shows this usage message.\n"); exit(0); } + if (opt_detach) + platform_detach_console(); /* Bind to the host in a protocol neutral way */ #ifdef SOCK_CLOEXEC -- 2.15.0

1 0

[PATCH] testbot: Assorted wording fixes.
by Francois Gouget 08 Dec '17

08 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- testbot/bin/WineSendLog.pl | 2 +- testbot/lib/ObjectModel/Collection.pm | 2 +- testbot/lib/WineTestBot/Users.pm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 2e239765..62024d97 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -394,7 +394,7 @@ EOF { # Filter out failures that happened in the full test suite: # the test suite is run against code which is already in Wine - # so all any failure it reported not caused by this patch. + # so any failure it reported is not caused by this patch. $MessagesFromLog = CompareLogs("$LatestName.log", "$TaskDir/log", $BaseName, $StepTask->CmdLineArg); } diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 1b29ec16..f31a7133 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -521,7 +521,7 @@ sub KeyChanged($$$) if (defined($self->{Items}{$NewKey})) { - die "Cant change key, new key $NewKey already exists"; + die "Could not change key, new key $NewKey already exists"; } $FullKey = $self->GetFullKey($NewKey); $ScopeItems->{$FullKey} = $Item if (defined $FullKey); diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 2139b6d5..7b18df97 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -190,7 +190,7 @@ From: $RobotEMail To: $Recipient Subject: winetestbot account request -password reset request for your account $UserName was received via the website. +A password reset request for your account $UserName was received via the website. You can pick a new password by going to: $URL EOF -- 2.15.0

1 0

[PATCH] testbot: Document Collection::DeleteItem().
by Francois Gouget 08 Dec '17

08 Dec '17

In particular note that it cascades to other tables that have foreign keys to the row being deleted. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index f31a7133..d4418603 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -550,6 +550,20 @@ sub GetMasterCols($) return ($self->{MasterColNames}, $self->{MasterColValues}); } +=pod +=over 12 + +=item C<DeleteItem()> + +Deletes the specified Item from the Collection and the database backing it. + +Note that if there are other tables with a foreign key referencing this item +the corresponding rows will be deleted too. So for instance deleting a Job +will also delete the Steps and Tasks it is composed of. + +=back +=cut + sub DeleteItem($$) { my ($self, $Item) = @_; -- 2.15.0

1 0

[PATCH v3 1/8] include: Add dhtmled.idl and dhtmldid.h
by Alex Henrie 07 Dec '17

07 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v3: Added default, source, and id attributes --- include/Makefile.in | 2 + include/dhtmldid.h | 67 +++++ include/dhtmled.idl | 716 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 785 insertions(+) create mode 100644 include/dhtmldid.h create mode 100644 include/dhtmled.idl diff --git a/include/Makefile.in b/include/Makefile.in index fa1e42738b..430c4733af 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -58,6 +58,7 @@ IDL_SRCS = \ ddstream.idl \ devenum.idl \ devicetopology.idl \ + dhtmled.idl \ dimm.idl \ dispex.idl \ docobj.idl \ @@ -342,6 +343,7 @@ HEADER_SRCS = \ devpkey.h \ devpropdef.h \ dhcpcsdk.h \ + dhtmldid.h \ difxapi.h \ digitalv.h \ dinput.h \ diff --git a/include/dhtmldid.h b/include/dhtmldid.h new file mode 100644 index 0000000000..85c286a102 --- /dev/null +++ b/include/dhtmldid.h @@ -0,0 +1,67 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define DISPID_LOADDOCUMENT 1 +#define DISPID_EXECCOMMAND 2 +#define DISPID_QUERYSTATUS 3 +#define DISPID_SAVEDOCUMENT 4 +#define DISPID_SETCONTEXTMENU 5 +#define DISPID_DOCUMENT 6 +#define DISPID_ACTIVATEAPPLETS 7 +#define DISPID_ACTIVATEACTIVEXCONTROLS 8 +#define DISPID_ACTIVATEDTCS 9 +#define DISPID_SHOWDETAILS 11 +#define DISPID_SHOWBORDERS 12 +#define DISPID_DHTMLEDITAPPEARANCE 13 +#define DISPID_DHTMLEDITSCROLLBARS 14 +#define DISPID_SCROLLBARAPPEARANCE 15 +#define DISPID_SOURCECODEPRESERVATION 16 +#define DISPID_DOCUMENTHTML 17 +#define DISPID_ABSOLUTEDROPMODE 18 +#define DISPID_SNAPTOGRIDX 19 +#define DISPID_SNAPTOGRIDY 20 +#define DISPID_SNAPTOGRID 21 +#define DISPID_ISDIRTY 22 +#define DISPID_CURRENTDOCUMENTPATH 23 +#define DISPID_BASEURL 24 +#define DISPID_DOCUMENTTITLE 25 +#define DISPID_BROWSEMODE 26 +#define DISPID_NEWDOCUMENT 27 +#define DISPID_PRINT 28 +#define DISPID_LOADURL 29 +#define DISPID_USEDIVONCR 30 +#define DISPID_FILTERSRCCODE 31 +#define DISPID_REFRESHDOC 32 +#define DISPID_BUSY 33 + +#define DISPID_DOCUMENTCOMPLETE 1 +#define DISPID_DISPLAYCHANGED 2 +#define DISPID_SHOWCONTEXTMENU 3 +#define DISPID_CONTEXTMENUACTION 4 +#define DISPID_ONMOUSEDOWN 5 +#define DISPID_ONMOUSEMOVE 6 +#define DISPID_ONMOUSEUP 7 +#define DISPID_ONMOUSEOUT 8 +#define DISPID_ONMOUSEOVER 9 +#define DISPID_ONCLICK 10 +#define DISPID_ONDBLCLICK 11 +#define DISPID_ONKEYDOWN 12 +#define DISPID_ONKEYPRESS 13 +#define DISPID_ONKEYUP 14 +#define DISPID_ONBLUR 15 +#define DISPID_ONREADYSTATECHANGE 16 diff --git a/include/dhtmled.idl b/include/dhtmled.idl new file mode 100644 index 0000000000..25f3ea9432 --- /dev/null +++ b/include/dhtmled.idl @@ -0,0 +1,716 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "docobj.idl"; +import "mshtml.idl"; + +#include "dhtmldid.h" + +[ + uuid(683364a1-b37d-11d1-adc5-006008a5848c), + version(1.0) +] +library DHTMLEDLib +{ + importlib("stdole2.tlb"); + + typedef + [ + uuid(7179FC44-B2E4-11d1-ADC5-006008A5848C) + ] + enum DHTMLEDITAPPEARANCE { + DEAPPEARANCE_FLAT, + DEAPPEARANCE_3D + } DHTMLEDITAPPEARANCE; + + typedef + [ + uuid(bf82426a-b961-11d1-adc5-006008a5848c) + ] + enum DHTMLEDITCMDF { + DECMDF_NOTSUPPORTED = 0, + DECMDF_DISABLED = 1, + DECMDF_ENABLED = 3, + DECMDF_LATCHED = 7, + DECMDF_NINCHED = 11 + } DHTMLEDITCMDF; + + typedef enum DHTMLEDITCMDID { + DECMD_BOLD = 5000, + DECMD_COPY = 5002, + DECMD_CUT, + DECMD_DELETE, + DECMD_DELETECELLS, + DECMD_DELETECOLS, + DECMD_DELETEROWS, + DECMD_FINDTEXT, + DECMD_FONT, + DECMD_GETBACKCOLOR, + DECMD_GETBLOCKFMT, + DECMD_GETBLOCKFMTNAMES, + DECMD_GETFONTNAME, + DECMD_GETFONTSIZE, + DECMD_GETFORECOLOR, + DECMD_HYPERLINK, + DECMD_IMAGE, + DECMD_INDENT, + DECMD_INSERTCELL, + DECMD_INSERTCOL, + DECMD_INSERTROW, + DECMD_INSERTTABLE, + DECMD_ITALIC, + DECMD_JUSTIFYCENTER, + DECMD_JUSTIFYLEFT, + DECMD_JUSTIFYRIGHT, + DECMD_LOCK_ELEMENT, + DECMD_MAKE_ABSOLUTE, + DECMD_MERGECELLS, + DECMD_ORDERLIST, + DECMD_OUTDENT, + DECMD_PASTE, + DECMD_REDO, + DECMD_REMOVEFORMAT, + DECMD_SELECTALL, + DECMD_SEND_BACKWARD, + DECMD_BRING_FORWARD, + DECMD_SEND_BELOW_TEXT, + DECMD_BRING_ABOVE_TEXT, + DECMD_SEND_TO_BACK, + DECMD_BRING_TO_FRONT, + DECMD_SETBACKCOLOR, + DECMD_SETBLOCKFMT, + DECMD_SETFONTNAME, + DECMD_SETFONTSIZE, + DECMD_SETFORECOLOR, + DECMD_SPLITCELL, + DECMD_UNDERLINE, + DECMD_UNDO, + DECMD_UNLINK, + DECMD_UNORDERLIST, + DECMD_PROPERTIES + } DHTMLEDITCMDID; + + [ + object, + uuid(ce04b590-2b1f-11d2-8d1e-00a0c959bc0a), + dual, + pointer_default(unique) + ] + interface IDHTMLSafe : IDispatch + { + [ + id(DISPID_EXECCOMMAND) + ] + HRESULT ExecCommand( + [in] DHTMLEDITCMDID cmd_id, + [in, defaultvalue(OLECMDEXECOPT_DODEFAULT)] OLECMDEXECOPT options, + [in, optional] VARIANT *code_in, + [out, retval] VARIANT *code_out + ); + + [ + id(DISPID_QUERYSTATUS) + ] + HRESULT QueryStatus( + [in] DHTMLEDITCMDID cmd_id, + [out, retval] DHTMLEDITCMDF *status + ); + + [ + id(DISPID_SETCONTEXTMENU) + ] + HRESULT SetContextMenu( + [in] VARIANT *strings, + [in] VARIANT *states + ); + + [ + id(DISPID_NEWDOCUMENT) + ] + HRESULT NewDocument(); + + [ + id(DISPID_LOADURL) + ] + HRESULT LoadURL( + [in] BSTR url + ); + + [ + id(DISPID_FILTERSRCCODE) + ] + HRESULT FilterSourceCode( + [in] BSTR in, + [out, retval] BSTR *out + ); + + [ + id(DISPID_REFRESHDOC) + ] + HRESULT Refresh(); + + [ + propget, + id(DISPID_DOCUMENT) + ] + HRESULT DOM( + [out, retval] IHTMLDocument2 **value + ); + + [ + propget, + id(DISPID_DOCUMENTHTML) + ] + HRESULT DocumentHTML( + [out, retval] BSTR *value + ); + + [ + propput, + id(DISPID_DOCUMENTHTML) + ] + HRESULT DocumentHTML( + [in] BSTR html + ); + + [ + propget, + id(DISPID_ACTIVATEAPPLETS) + ] + HRESULT ActivateApplets( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_ACTIVATEAPPLETS) + ] + HRESULT ActivateApplets( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_ACTIVATEACTIVEXCONTROLS) + ] + HRESULT ActivateActiveXControls( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_ACTIVATEACTIVEXCONTROLS) + ] + HRESULT ActivateActiveXControls( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_ACTIVATEDTCS) + ] + HRESULT ActivateDTCs( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_ACTIVATEDTCS) + ] + HRESULT ActivateDTCs( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_SHOWDETAILS) + ] + HRESULT ShowDetails( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_SHOWDETAILS) + ] + HRESULT ShowDetails( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_SHOWBORDERS) + ] + HRESULT ShowBorders( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_SHOWBORDERS) + ] + HRESULT ShowBorders( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_DHTMLEDITAPPEARANCE) + ] + HRESULT Appearance( + [out, retval] DHTMLEDITAPPEARANCE *value + ); + + [ + propput, + id(DISPID_DHTMLEDITAPPEARANCE) + ] + HRESULT Appearance( + [in] DHTMLEDITAPPEARANCE value + ); + + [ + propget, + id(DISPID_DHTMLEDITSCROLLBARS) + ] + HRESULT Scrollbars( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_DHTMLEDITSCROLLBARS) + ] + HRESULT Scrollbars( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_SCROLLBARAPPEARANCE) + ] + HRESULT ScrollbarAppearance( + [out, retval] DHTMLEDITAPPEARANCE *value + ); + + [ + propput, + id(DISPID_SCROLLBARAPPEARANCE) + ] + HRESULT ScrollbarAppearance( + [in] DHTMLEDITAPPEARANCE value + ); + + [ + propget, + id(DISPID_SOURCECODEPRESERVATION) + ] + HRESULT SourceCodePreservation( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_SOURCECODEPRESERVATION) + ] + HRESULT SourceCodePreservation( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_ABSOLUTEDROPMODE) + ] + HRESULT AbsoluteDropMode( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_ABSOLUTEDROPMODE) + ] + HRESULT AbsoluteDropMode( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_SNAPTOGRIDX) + ] + HRESULT SnapToGridX( + [out, retval] long *value + ); + + [ + propput, + id(DISPID_SNAPTOGRIDX) + ] + HRESULT SnapToGridX( + [in] long value + ); + + [ + propget, + id(DISPID_SNAPTOGRIDY) + ] + HRESULT SnapToGridY( + [out, retval] long *value + ); + + [ + propput, + id(DISPID_SNAPTOGRIDY) + ] + HRESULT SnapToGridY( + [in] long value + ); + + [ + propget, + id(DISPID_SNAPTOGRID) + ] + HRESULT SnapToGrid( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_SNAPTOGRID) + ] + HRESULT SnapToGrid( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_ISDIRTY) + ] + HRESULT IsDirty( + [out, retval] VARIANT_BOOL *value + ); + + [ + propget, + id(DISPID_CURRENTDOCUMENTPATH) + ] + HRESULT CurrentDocumentPath( + [out, retval] BSTR *value + ); + + [ + propget, + id(DISPID_BASEURL) + ] + HRESULT BaseURL( + [out, retval] BSTR *value + ); + + [ + propput, + id(DISPID_BASEURL) + ] + HRESULT BaseURL( + [in] BSTR value + ); + + [ + propget, + id(DISPID_DOCUMENTTITLE) + ] + HRESULT DocumentTitle( + [out, retval] BSTR *value + ); + + [ + propget, + id(DISPID_USEDIVONCR) + ] + HRESULT UseDivOnCarriageReturn( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_USEDIVONCR) + ] + HRESULT UseDivOnCarriageReturn( + [in] VARIANT_BOOL value + ); + + [ + propget, + id(DISPID_BUSY) + ] + HRESULT Busy( + [out, retval] VARIANT_BOOL *value + ); + }; + + [ + uuid(d1fc78e8-b380-11d1-adc5-006008a5848c) + ] + dispinterface _DHTMLSafeEvents + { + properties: + methods: + [ + id(DISPID_DOCUMENTCOMPLETE) + ] + void DocumentComplete(); + + [ + id(DISPID_DISPLAYCHANGED) + ] + void DisplayChanged(); + + [ + id(DISPID_SHOWCONTEXTMENU) + ] + void ShowContextMenu( + [in] long x, + [in] long y + ); + + [ + id(DISPID_CONTEXTMENUACTION) + ] + void ContextMenuAction( + [in] long index + ); + + [ + id(DISPID_ONMOUSEDOWN) + ] + void onmousedown(); + + [ + id(DISPID_ONMOUSEMOVE) + ] + void onmousemove(); + + [ + id(DISPID_ONMOUSEUP) + ] + void onmouseup(); + + [ + id(DISPID_ONMOUSEOUT) + ] + void onmouseout(); + + [ + id(DISPID_ONMOUSEOVER) + ] + void onmouseover(); + + [ + id(DISPID_ONCLICK) + ] + void onclick(); + + [ + id(DISPID_ONDBLCLICK) + ] + void ondblclick(); + + [ + id(DISPID_ONKEYDOWN) + ] + void onkeydown(); + + [ + id(DISPID_ONKEYPRESS) + ] + void onkeypress(); + + [ + id(DISPID_ONKEYUP) + ] + void onkeyup(); + + [ + id(DISPID_ONBLUR) + ] + void onblur(); + + [ + id(DISPID_ONREADYSTATECHANGE) + ] + void onreadystatechange(); + }; + + [ + uuid(2d360201-fff5-11d1-8d03-00a0c959bc0a) + ] + coclass DHTMLSafe + { + [default] interface IDHTMLSafe; + [default, source] interface _DHTMLSafeEvents; + }; + + [ + uuid(ce04b591-2b1f-11d2-8d1e-00a0c959bc0a), + dual, + pointer_default(unique) + ] + interface IDHTMLEdit : IDHTMLSafe + { + [ + id(DISPID_LOADDOCUMENT) + ] + HRESULT LoadDocument( + [in] VARIANT *path, + [in, optional] VARIANT *prompt + ); + + [ + id(DISPID_SAVEDOCUMENT) + ] + HRESULT SaveDocument( + [in] VARIANT *path, + [in, optional] VARIANT *prompt + ); + + [ + id(DISPID_PRINT) + ] + HRESULT PrintDocument( + [in, optional] VARIANT *prompt + ); + + [ + propget, + id(DISPID_BROWSEMODE) + ] + HRESULT BrowseMode( + [out, retval] VARIANT_BOOL *value + ); + + [ + propput, + id(DISPID_BROWSEMODE) + ] + HRESULT BrowseMode( + [in] VARIANT_BOOL value + ); + }; + + [ + uuid(588d5040-cf28-11d1-8cd3-00a0c959bc0a) + ] + dispinterface _DHTMLEditEvents + { + properties: + methods: + [ + id(DISPID_DOCUMENTCOMPLETE) + ] + void DocumentComplete(); + + [ + id(DISPID_DISPLAYCHANGED) + ] + void DisplayChanged(); + + [ + id(DISPID_SHOWCONTEXTMENU) + ] + void ShowContextMenu( + [in] long x, + [in] long y + ); + + [ + id(DISPID_CONTEXTMENUACTION) + ] + void ContextMenuAction( + [in] long index + ); + + [ + id(DISPID_ONMOUSEDOWN) + ] + void onmousedown(); + + [ + id(DISPID_ONMOUSEMOVE) + ] + void onmousemove(); + + [ + id(DISPID_ONMOUSEUP) + ] + void onmouseup(); + + [ + id(DISPID_ONMOUSEOUT) + ] + void onmouseout(); + + [ + id(DISPID_ONMOUSEOVER) + ] + void onmouseover(); + + [ + id(DISPID_ONCLICK) + ] + void onclick(); + + [ + id(DISPID_ONDBLCLICK) + ] + void ondblclick(); + + [ + id(DISPID_ONKEYDOWN) + ] + void onkeydown(); + + [ + id(DISPID_ONKEYPRESS) + ] + void onkeypress(); + + [ + id(DISPID_ONKEYUP) + ] + void onkeyup(); + + [ + id(DISPID_ONBLUR) + ] + void onblur(); + + [ + id(DISPID_ONREADYSTATECHANGE) + ] + void onreadystatechange(); + }; + + [ + uuid(2d360200-fff5-11d1-8d03-00a0c959bc0a) + ] + coclass DHTMLEdit + { + [default] interface IDHTMLEdit; + [default, source] interface _DHTMLEditEvents; + }; +} -- 2.15.1

2 1

[PATCH v2 1/8] include: Add dhtmled.idl
by Alex Henrie 07 Dec '17

07 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Added argument attributes --- include/Makefile.in | 1 + include/dhtmled.idl | 330 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 331 insertions(+) create mode 100644 include/dhtmled.idl diff --git a/include/Makefile.in b/include/Makefile.in index fa1e42738b..a08c8084c1 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -58,6 +58,7 @@ IDL_SRCS = \ ddstream.idl \ devenum.idl \ devicetopology.idl \ + dhtmled.idl \ dimm.idl \ dispex.idl \ docobj.idl \ diff --git a/include/dhtmled.idl b/include/dhtmled.idl new file mode 100644 index 0000000000..0c3e38c08e --- /dev/null +++ b/include/dhtmled.idl @@ -0,0 +1,330 @@ +/* + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "docobj.idl"; +import "mshtml.idl"; + +[ + uuid(683364a1-b37d-11d1-adc5-006008a5848c), + version(1.0) +] +library DHTMLEDLib +{ + importlib("stdole2.tlb"); + + typedef + [ + uuid(7179FC44-B2E4-11d1-ADC5-006008A5848C) + ] + enum DHTMLEDITAPPEARANCE { + DEAPPEARANCE_FLAT, + DEAPPEARANCE_3D + } DHTMLEDITAPPEARANCE; + + typedef + [ + uuid(bf82426a-b961-11d1-adc5-006008a5848c) + ] + enum DHTMLEDITCMDF { + DECMDF_NOTSUPPORTED = 0, + DECMDF_DISABLED = 1, + DECMDF_ENABLED = 3, + DECMDF_LATCHED = 7, + DECMDF_NINCHED = 11 + } DHTMLEDITCMDF; + + typedef enum DHTMLEDITCMDID { + DECMD_BOLD = 5000, + DECMD_COPY = 5002, + DECMD_CUT, + DECMD_DELETE, + DECMD_DELETECELLS, + DECMD_DELETECOLS, + DECMD_DELETEROWS, + DECMD_FINDTEXT, + DECMD_FONT, + DECMD_GETBACKCOLOR, + DECMD_GETBLOCKFMT, + DECMD_GETBLOCKFMTNAMES, + DECMD_GETFONTNAME, + DECMD_GETFONTSIZE, + DECMD_GETFORECOLOR, + DECMD_HYPERLINK, + DECMD_IMAGE, + DECMD_INDENT, + DECMD_INSERTCELL, + DECMD_INSERTCOL, + DECMD_INSERTROW, + DECMD_INSERTTABLE, + DECMD_ITALIC, + DECMD_JUSTIFYCENTER, + DECMD_JUSTIFYLEFT, + DECMD_JUSTIFYRIGHT, + DECMD_LOCK_ELEMENT, + DECMD_MAKE_ABSOLUTE, + DECMD_MERGECELLS, + DECMD_ORDERLIST, + DECMD_OUTDENT, + DECMD_PASTE, + DECMD_REDO, + DECMD_REMOVEFORMAT, + DECMD_SELECTALL, + DECMD_SEND_BACKWARD, + DECMD_BRING_FORWARD, + DECMD_SEND_BELOW_TEXT, + DECMD_BRING_ABOVE_TEXT, + DECMD_SEND_TO_BACK, + DECMD_BRING_TO_FRONT, + DECMD_SETBACKCOLOR, + DECMD_SETBLOCKFMT, + DECMD_SETFONTNAME, + DECMD_SETFONTSIZE, + DECMD_SETFORECOLOR, + DECMD_SPLITCELL, + DECMD_UNDERLINE, + DECMD_UNDO, + DECMD_UNLINK, + DECMD_UNORDERLIST, + DECMD_PROPERTIES + } DHTMLEDITCMDID; + + [ + object, + uuid(ce04b590-2b1f-11d2-8d1e-00a0c959bc0a), + dual, + pointer_default(unique) + ] + interface IDHTMLSafe : IDispatch + { + HRESULT ExecCommand( + [in] DHTMLEDITCMDID cmd_id, + [in, defaultvalue(OLECMDEXECOPT_DODEFAULT)] OLECMDEXECOPT options, + [in, optional] VARIANT *code_in, + [out, retval] VARIANT *code_out + ); + + HRESULT QueryStatus( + [in] DHTMLEDITCMDID cmd_id, + [out, retval] DHTMLEDITCMDF *status + ); + + HRESULT SetContextMenu( + [in] VARIANT *strings, + [in] VARIANT *states + ); + + HRESULT NewDocument(); + + HRESULT LoadURL([in] BSTR url); + + HRESULT FilterSourceCode( + [in] BSTR in, + [out, retval] BSTR *out + ); + + HRESULT Refresh(); + + [propget] HRESULT DOM([out, retval] IHTMLDocument2 **value); + + [propget] HRESULT DocumentHTML([out, retval] BSTR *value); + [propput] HRESULT DocumentHTML([in] BSTR html); + + [propget] HRESULT ActivateApplets([out, retval] VARIANT_BOOL *value); + [propput] HRESULT ActivateApplets([in] VARIANT_BOOL value); + + [propget] HRESULT ActivateActiveXControls([out, retval] VARIANT_BOOL *value); + [propput] HRESULT ActivateActiveXControls([in] VARIANT_BOOL value); + + [propget] HRESULT ActivateDTCs([out, retval] VARIANT_BOOL *value); + [propput] HRESULT ActivateDTCs([in] VARIANT_BOOL value); + + [propget] HRESULT ShowDetails([out, retval] VARIANT_BOOL *value); + [propput] HRESULT ShowDetails([in] VARIANT_BOOL value); + + [propget] HRESULT ShowBorders([out, retval] VARIANT_BOOL *value); + [propput] HRESULT ShowBorders([in] VARIANT_BOOL value); + + [propget] HRESULT Appearance([out, retval] DHTMLEDITAPPEARANCE *value); + [propput] HRESULT Appearance([in] DHTMLEDITAPPEARANCE value); + + [propget] HRESULT Scrollbars([out, retval] VARIANT_BOOL *value); + [propput] HRESULT Scrollbars([in] VARIANT_BOOL value); + + [propget] HRESULT ScrollbarAppearance([out, retval] DHTMLEDITAPPEARANCE *value); + [propput] HRESULT ScrollbarAppearance([in] DHTMLEDITAPPEARANCE value); + + [propget] HRESULT SourceCodePreservation([out, retval] VARIANT_BOOL *value); + [propput] HRESULT SourceCodePreservation([in] VARIANT_BOOL value); + + [propget] HRESULT AbsoluteDropMode([out, retval] VARIANT_BOOL *value); + [propput] HRESULT AbsoluteDropMode([in] VARIANT_BOOL value); + + [propget] HRESULT SnapToGridX([out, retval] long *value); + [propput] HRESULT SnapToGridX([in] long value); + + [propget] HRESULT SnapToGridY([out, retval] long *value); + [propput] HRESULT SnapToGridY([in] long value); + + [propget] HRESULT SnapToGrid([out, retval] VARIANT_BOOL *value); + [propput] HRESULT SnapToGrid([in] VARIANT_BOOL value); + + [propget] HRESULT IsDirty([out, retval] VARIANT_BOOL *value); + + [propget] HRESULT CurrentDocumentPath([out, retval] BSTR *value); + + [propget] HRESULT BaseURL([out, retval] BSTR *value); + [propput] HRESULT BaseURL([in] BSTR value); + + [propget] HRESULT DocumentTitle([out, retval] BSTR *value); + + [propget] HRESULT UseDivOnCarriageReturn([out, retval] VARIANT_BOOL *value); + [propput] HRESULT UseDivOnCarriageReturn([in] VARIANT_BOOL value); + + [propget] HRESULT Busy([out, retval] VARIANT_BOOL *value); + }; + + [ + uuid(d1fc78e8-b380-11d1-adc5-006008a5848c) + ] + dispinterface _DHTMLSafeEvents + { + properties: + methods: + void DocumentComplete(); + + void DisplayChanged(); + + void ShowContextMenu( + [in] long x, + [in] long y + ); + + void ContextMenuAction([in] long index); + + void onmousedown(); + + void onmousemove(); + + void onmouseup(); + + void onmouseout(); + + void onmouseover(); + + void onclick(); + + void ondblclick(); + + void onkeydown(); + + void onkeypress(); + + void onkeyup(); + + void onblur(); + + void onreadystatechange(); + }; + + [ + uuid(2d360201-fff5-11d1-8d03-00a0c959bc0a) + ] + coclass DHTMLSafe + { + interface IDHTMLSafe; + interface _DHTMLSafeEvents; + }; + + [ + uuid(ce04b591-2b1f-11d2-8d1e-00a0c959bc0a), + dual, + pointer_default(unique) + ] + interface IDHTMLEdit : IDHTMLSafe + { + HRESULT LoadDocument( + [in] VARIANT *path, + [in, optional] VARIANT *prompt + ); + + HRESULT SaveDocument( + [in] VARIANT *path, + [in, optional] VARIANT *prompt + ); + + HRESULT PrintDocument([in, optional] VARIANT *prompt); + + [propget] HRESULT BrowseMode([out, retval] VARIANT_BOOL *value); + + [propput] HRESULT BrowseMode([in] VARIANT_BOOL value); + }; + + [ + uuid(588d5040-cf28-11d1-8cd3-00a0c959bc0a) + ] + dispinterface _DHTMLEditEvents + { + properties: + methods: + void DocumentComplete(); + + void DisplayChanged(); + + void ShowContextMenu( + [in] long x, + [in] long y + ); + + void ContextMenuAction([in] long index); + + void onmousedown(); + + void onmousemove(); + + void onmouseup(); + + void onmouseout(); + + void onmouseover(); + + void onclick(); + + void ondblclick(); + + void onkeydown(); + + void onkeypress(); + + void onkeyup(); + + void onblur(); + + void onreadystatechange(); + }; + + [ + uuid(2d360200-fff5-11d1-8d03-00a0c959bc0a) + ] + coclass DHTMLEdit + { + interface IDHTMLEdit; + interface _DHTMLEditEvents; + }; +} -- 2.15.1

2 14

[PATCH 8/8] rsaenh: Removed no longer needed ALG_ID argument from helper functions.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 8 +++----- dlls/rsaenh/implglue.h | 6 +++--- dlls/rsaenh/rsaenh.c | 21 +++++++++------------ 3 files changed, 15 insertions(+), 20 deletions(-)

1 0

[PATCH 7/8] rsaenh: Use bcrypt for MD5 hashes.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 43 ++++++------------------------------------- dlls/rsaenh/implglue.h | 10 ---------- 2 files changed, 6 insertions(+), 47 deletions(-)

1 0

[PATCH 6/8] rsaenh: Use bcrypt for MD4 hashes.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 18 ++---------------- dlls/rsaenh/implglue.h | 9 --------- 2 files changed, 2 insertions(+), 25 deletions(-)

1 0

[PATCH 5/8] bcrypt: Added support for MD4 hashes.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 11 +++++++++++ dlls/bcrypt/bcrypt_main.c | 17 +++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 6 ++++++ include/bcrypt.h | 1 + 4 files changed, 35 insertions(+)

1 0

[PATCH 4/8] rsaenh: Use bcrypt for SHA1 hashes.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 17 ++--------------- dlls/rsaenh/implglue.h | 10 ---------- 2 files changed, 2 insertions(+), 25 deletions(-)

1 0

[PATCH 3/8 resend] rsaenh: Use bcrypt for MD2 hashes.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rsaenh/Makefile.in | 1 - dlls/rsaenh/implglue.c | 13 +---- dlls/rsaenh/implglue.h | 1 - dlls/rsaenh/md2.c | 151 ------------------------------------------------ dlls/rsaenh/tomcrypt.h | 9 --- 5 files changed, 2 insertions(+), 173 deletions(-) delete mode 100644 dlls/rsaenh/md2.c

1 0

[PATCH 2/8 v2] bcrypt: Added MD2 hash support.
by Jacek Caban 07 Dec '17

07 Dec '17

By adopting rsaenh implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- v2: Without tests depending on Windows version. dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/bcrypt_internal.h | 9 +++ dlls/bcrypt/bcrypt_main.c | 16 +++++ dlls/bcrypt/md2.c | 145 ++++++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 6 ++ include/bcrypt.h | 1 + 6 files changed, 178 insertions(+) create mode 100644 dlls/bcrypt/md2.c

1 0

[PATCH 1/8 resend] bcrypt/tests: Use common helper for testing different hash types.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/bcrypt/tests/bcrypt.c | 431 ++++++++------------------------------------- 1 file changed, 69 insertions(+), 362 deletions(-)

1 0

[PATCH 6/9] bcrypt: Added support for MD4 hashes.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/bcrypt/bcrypt_internal.h | 11 +++++++++++ dlls/bcrypt/bcrypt_main.c | 17 +++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 6 ++++++ include/bcrypt.h | 1 + 4 files changed, 35 insertions(+)

2 1

[PATCH 3/9] bcrypt: Added MD2 hash support.
by Jacek Caban 07 Dec '17

07 Dec '17

By adopting rsaenh implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/bcrypt/Makefile.in | 1 + dlls/bcrypt/bcrypt_internal.h | 9 +++ dlls/bcrypt/bcrypt_main.c | 16 +++++ dlls/bcrypt/md2.c | 145 ++++++++++++++++++++++++++++++++++++++++++ dlls/bcrypt/tests/bcrypt.c | 6 ++ include/bcrypt.h | 1 + 6 files changed, 178 insertions(+) create mode 100644 dlls/bcrypt/md2.c

2 1

[PATCH 2/9] bcrypt: Fixed MD5 object length value.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/bcrypt/bcrypt_main.c | 2 +- dlls/bcrypt/tests/bcrypt.c | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-)

2 1

[PATCH 9/9] rsaenh: Removed no longer needed ALG_ID argument from helper functions.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 8 +++----- dlls/rsaenh/implglue.h | 6 +++--- dlls/rsaenh/rsaenh.c | 21 +++++++++------------ 3 files changed, 15 insertions(+), 20 deletions(-)

1 0

[PATCH 8/9] rsaenh: Use bcrypt for MD5 hashes.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 43 ++++++------------------------------------- dlls/rsaenh/implglue.h | 10 ---------- 2 files changed, 6 insertions(+), 47 deletions(-)

1 0

[PATCH 7/9] rsaenh: Use bcrypt for MD4 hashes.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 18 ++---------------- dlls/rsaenh/implglue.h | 9 --------- 2 files changed, 2 insertions(+), 25 deletions(-)

1 0

[PATCH 5/9] rsaenh: Use bcrypt for SHA1 hashes.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rsaenh/implglue.c | 17 ++--------------- dlls/rsaenh/implglue.h | 10 ---------- 2 files changed, 2 insertions(+), 25 deletions(-)

1 0

[PATCH 4/9] rsaenh: Use bcrypt for MD2 hashes.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/rsaenh/Makefile.in | 1 - dlls/rsaenh/implglue.c | 13 +---- dlls/rsaenh/implglue.h | 1 - dlls/rsaenh/md2.c | 151 ------------------------------------------------ dlls/rsaenh/tomcrypt.h | 9 --- 5 files changed, 2 insertions(+), 173 deletions(-) delete mode 100644 dlls/rsaenh/md2.c

1 0

[PATCH 1/9] bcrypt/tests: Use common helper for testing different hash types.
by Jacek Caban 07 Dec '17

07 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/bcrypt/tests/bcrypt.c | 431 ++++++++------------------------------------- 1 file changed, 69 insertions(+), 362 deletions(-)

1 0

[PATCH 1/9] ddraw: Also store supported user clip planes.
by Józef Kucia 07 Dec '17

07 Dec '17

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/device.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 32a2f1a6be50..542f23a0ef26 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6469,11 +6469,14 @@ static HRESULT d3d_device7_SetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV wined3d_mutex_lock(); hr = wined3d_device_set_clip_plane(device->wined3d_device, idx, wined3d_plane); - if (hr == WINED3DERR_INVALIDCALL && idx < ARRAY_SIZE(device->user_clip_planes)) + if (idx < ARRAY_SIZE(device->user_clip_planes)) { - WARN("Clip plane %u is not supported.\n", idx); device->user_clip_planes[idx] = *wined3d_plane; - hr = D3D_OK; + if (hr == WINED3DERR_INVALIDCALL) + { + WARN("Clip plane %u is not supported.\n", idx); + hr = D3D_OK; + } } wined3d_mutex_unlock(); -- 2.13.6

4 18

[PATCH] wined3d: Raise the default max_gl_version for specific cases.
by Henri Verbeet 07 Dec '17

07 Dec '17

Effectively, this will enable Direct3D 11 by default on AMD and Intel hardware. Yes, this patch is awful. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/directx.c | 22 ++++++++++++++++++++-- dlls/wined3d/wined3d_main.c | 11 +++++------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cc8a78c..c145944 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6527,6 +6527,22 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter *adapter, HDC dc } } +static DWORD get_max_gl_version(const struct wined3d_gl_info *gl_info, DWORD flags) +{ + const char *gl_vendor, *gl_renderer; + + if (wined3d_settings.explicit_gl_version || (flags & WINED3D_PIXEL_CENTER_INTEGER)) + return wined3d_settings.max_gl_version; + + gl_vendor = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_VENDOR); + gl_renderer = (const char *)gl_info->gl_ops.gl.p_glGetString(GL_RENDERER); + if (!gl_vendor || !gl_renderer + || wined3d_guess_card_vendor(gl_vendor, gl_renderer) == HW_VENDOR_NVIDIA) + return wined3d_settings.max_gl_version; + + return MAKEDWORD_VERSION(4, 4); +} + static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, DWORD wined3d_creation_flags) { static const DWORD supported_gl_versions[] = @@ -6539,6 +6555,7 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; unsigned int i; DISPLAY_DEVICEW display_device; + DWORD max_gl_version; TRACE("adapter %p, ordinal %u.\n", adapter, ordinal); @@ -6583,15 +6600,16 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, return FALSE; } + max_gl_version = get_max_gl_version(gl_info, wined3d_creation_flags); for (i = 0; i < ARRAY_SIZE(supported_gl_versions); ++i) { - if (supported_gl_versions[i] <= wined3d_settings.max_gl_version) + if (supported_gl_versions[i] <= max_gl_version) break; } if (i == ARRAY_SIZE(supported_gl_versions)) { ERR_(winediag)("Requested invalid GL version %u.%u.\n", - wined3d_settings.max_gl_version >> 16, wined3d_settings.max_gl_version & 0xffff); + max_gl_version >> 16, max_gl_version & 0xffff); i = ARRAY_SIZE(supported_gl_versions) - 1; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 54ddc23..28a34a7 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -73,6 +73,7 @@ static CRITICAL_SECTION wined3d_wndproc_cs = {&wined3d_wndproc_cs_debug, -1, 0, struct wined3d_settings wined3d_settings = { FALSE, /* No multithreaded CS by default. */ + FALSE, /* explicit_gl_version */ MAKEDWORD_VERSION(1, 0), /* Default to legacy OpenGL */ TRUE, /* Use of GLSL enabled by default */ ORM_FBO, /* Use FBOs to do offscreen rendering */ @@ -215,12 +216,10 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) ERR_(winediag)("Setting multithreaded command stream to %#x.\n", wined3d_settings.cs_multithreaded); if (!get_config_key_dword(hkey, appkey, "MaxVersionGL", &tmpvalue)) { - if (tmpvalue != wined3d_settings.max_gl_version) - { - ERR_(winediag)("Setting maximum allowed wined3d GL version to %u.%u.\n", - tmpvalue >> 16, tmpvalue & 0xffff); - wined3d_settings.max_gl_version = tmpvalue; - } + ERR_(winediag)("Setting maximum allowed wined3d GL version to %u.%u.\n", + tmpvalue >> 16, tmpvalue & 0xffff); + wined3d_settings.explicit_gl_version = TRUE; + wined3d_settings.max_gl_version = tmpvalue; } if ( !get_config_key( hkey, appkey, "UseGLSL", buffer, size) ) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a79a68f..f03733d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -382,6 +382,7 @@ static inline void wined3d_pause(void) struct wined3d_settings { unsigned int cs_multithreaded; + BOOL explicit_gl_version; DWORD max_gl_version; BOOL glslRequested; int offscreen_rendering_mode; -- 2.1.4

1 0

[PATCH] po: Update Finnish translation.
by Lauri Kenttä 07 Dec '17

07 Dec '17

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/po/fi.po b/po/fi.po index 9809abeac6..0c4fa20d60 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11993,17 +11993,6 @@ msgid "Icons (*.ico)" msgstr "Kuvakkeet (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12019,7 +12008,7 @@ msgstr "" " REG [toiminto] [parametrit]\n" "\n" "Tuetut toiminnot:\n" -" ADD, DELETE, IMPORT, QUERY\n" +" ADD, DELETE, IMPORT, EXPORT, QUERY\n" "\n" "Ohjeen kustakin toiminnosta saa komennolla\n" " REG [toiminto] /?\n" @@ -12163,22 +12152,16 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: Tuntematon merkintä [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG IMPORT file.reg\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG IMPORT tiedosto.reg\n" +msgstr "REG EXPORT avaimen_nimi tiedosto.reg\n" #: reg.rc:71 -#, fuzzy -#| msgid "regedit: Invalid system key [%1]\n" msgid "reg: Invalid system key [%1]\n" -msgstr "regedit: Järjestelmäavain [%1] ei kelpaa\n" +msgstr "reg: Järjestelmäavain [%1] ei kelpaa\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "Rekisterin arvo '%1' on jo olemassa. Haluatko korvata sen?" +msgstr "Tiedosto '%1' on jo olemassa. Haluatko korvata sen?" #: regedit.rc:34 msgid "&Registry" -- 2.15.1

1 0

[PATCH 1/2] wined3d: Correctly restore texture max level in shader_resource_view_generate_mipmaps().
by Józef Kucia 07 Dec '17

07 Dec '17

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/view.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 4463fabb6ae5..3322baa2b5b7 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -842,7 +842,7 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * base_level = view->desc.u.texture.level_idx; max_level = base_level + level_count - 1; - srgb = !!(texture->flags & WINED3D_TEXTURE_IS_SRGB); + srgb = texture->flags & WINED3D_TEXTURE_IS_SRGB; location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; for (i = 0; i < layer_count; ++i) wined3d_texture_load_location(texture, i * level_count + base_level, context, location); @@ -874,11 +874,8 @@ void shader_resource_view_generate_mipmaps(struct wined3d_shader_resource_view * } } - gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_MAX_LEVEL, level_count - 1); - if (srgb) - texture->texture_srgb.base_level = base_level; - else - texture->texture_rgb.base_level = base_level; + gl_info->gl_ops.gl.p_glTexParameteri(texture->target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + gl_tex->base_level = base_level; context_release(context); } -- 2.13.6

3 3

[PATCH v2] readme: Move WineHQ URLs to https in translations.
by Lauri Kenttä 07 Dec '17

07 Dec '17

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- documentation/README.de | 24 ++++++++++++------------ documentation/README.es | 22 +++++++++++----------- documentation/README.fi | 20 ++++++++++---------- documentation/README.fr | 24 ++++++++++++------------ documentation/README.hu | 14 +++++++------- documentation/README.it | 24 ++++++++++++------------ documentation/README.ja | 20 ++++++++++---------- documentation/README.ko | 16 ++++++++-------- documentation/README.no | 24 ++++++++++++------------ documentation/README.pt | 12 ++++++------ documentation/README.pt_br | 24 ++++++++++++------------ documentation/README.ru | 20 ++++++++++---------- documentation/README.tr | 22 +++++++++++----------- documentation/README.uk | 24 ++++++++++++------------ documentation/README.zh_cn | 24 ++++++++++++------------ 15 files changed, 157 insertions(+), 157 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 5f450d12aa..2066bdfd04 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -24,7 +24,7 @@ make Starten Sie Programme mit "wine Programmname". Weitere Informationen und Problemlösungen entnehmen Sie bitte dem Rest dieser Datei, der Man-Page von Wine und insbesondere der Vielzahl an -Informationen, die Sie auf http://www.winehq.org finden. +Informationen, die Sie auf https://www.winehq.org finden. 3. VORAUSSETZUNGEN @@ -45,7 +45,7 @@ Umständen in der Zukunft unterstützt. FreeBSD-Info: Wine wird generell nicht korrekt unter FreeBSD vor 8.0 funktionieren. Für - weitere Informationen überprüfen Sie auch http://wiki.freebsd.org/Wine + weitere Informationen überprüfen Sie auch https://wiki.freebsd.org/Wine Solaris-Info: Höchstwahrscheinlich werden Sie Wine mit der GNU-Toolchain (gcc, gas etc.) @@ -81,13 +81,13 @@ Optionale Bibliotheken: Der Configure-Aufruf zeigt am Ende optionale Bibliotheken an, die von Wine benutzt werden können, aber auf Ihrem System nicht gefunden wurden. Tipps zum Installieren fehlender Pakete finden Sie unter: - http://wiki.winehq.org/Recommended_Packages + https://wiki.winehq.org/Recommended_Packages Unter 64-Bit Plattformen, falls Sie Wine als 32-Bit kompilieren (Standard), benötigen Sie die 32-Bit-Versionen dieser Bibliotheken; Details unter - http://wiki.winehq.org/WineOn64bit + https://wiki.winehq.org/WineOn64bit Für ein reines 64-Bit Wine (oder ein gemischtes 32- und 64-Bit Wine-Setup), - siehe http://wiki.winehq.org/Wine64 + siehe https://wiki.winehq.org/Wine64 4. KOMPILIEREN @@ -116,7 +116,7 @@ der neuen in Konflikt stehen könnten. Versuchen Sie entweder "dpkg -r wine", "rpm -e wine" oder "make uninstall" vor der Installation auszuführen. Nach der Installation können Sie das Tool "winecfg" starten. -Konfigurationshinweise finden Sie im Support-Bereich auf http://www.winehq.org/ +Konfigurationshinweise finden Sie im Support-Bereich auf https://www.winehq.org/ 6. AUSFÜHREN VON PROGRAMMEN @@ -143,19 +143,19 @@ wenn Sie den Fehler melden. 7. WEITERFÜHRENDE INFORMATIONEN WWW: Eine große Menge an Informationen findet sich im WineHQ unter - http://www.winehq.org/ : Verschiedene Wine Guides, + https://www.winehq.org/ : Verschiedene Wine Guides, Applikations-Datenbank, Bugtracker. Das ist vermutlich der beste Ausgangspunkt. -FAQ: Die FAQ zu Wine befindet sich unter http://www.winehq.org/FAQ +FAQ: Die FAQ zu Wine befindet sich unter https://www.winehq.org/FAQ -Wiki: Das Wine-Wiki finden Sie unter http://wiki.winehq.org +Wiki: Das Wine-Wiki finden Sie unter https://wiki.winehq.org Mailing-Listen: Es gibt mehrere Mailing-Listen für Wine-Anwender und -Entwickler; - Schauen Sie sich dazu bitte http://www.winehq.org/forums an. + Schauen Sie sich dazu bitte https://www.winehq.org/forums an. -Fehler: Melden Sie Fehler bitte an Wine-Bugzilla unter http://bugs.winehq.org +Fehler: Melden Sie Fehler bitte an Wine-Bugzilla unter https://bugs.winehq.org Schauen Sie bitte erst in der Bugzilla-Datenbank nach, ob Ihr Problem bereits bekannt ist oder sogar behoben wurde, bevor Sie eine Fehlermeldung verfassen. @@ -163,7 +163,7 @@ Fehler: Melden Sie Fehler bitte an Wine-Bugzilla unter http://bugs.winehq.org IRC: Online-Hilfe ist im IRC-Kanal #WineHQ unter irc.freenode.net verfügbar. Git: Der aktuelle Wine-Entwicklungsstand ist über Git verfügbar. - Besuchen Sie http://www.winehq.org/git für weitere Informationen. + Besuchen Sie https://www.winehq.org/git für weitere Informationen. Wenn Sie etwas hinzufügen oder einen Fehler beheben, senden Sie bitte einen Patch (vorzugsweise mit git-format-patch) an die Liste wine-devel(a)winehq.org, diff --git a/documentation/README.es b/documentation/README.es index 08169115d9..8068217ebc 100644 --- a/documentation/README.es +++ b/documentation/README.es @@ -22,7 +22,7 @@ Wine para compilar e instalar Wine. Desde el directorio base del código de Wine Ejecute aplicaciones con "wine programa". Para más información y resolución de problemas, continúe leyendo este archivo, la página man de Wine, o más específicamente, la numerosa información que puede encontrar en -http://www.winehq.org. +https://www.winehq.org. 3. REQUISITOS @@ -42,7 +42,7 @@ podrían obtener soporte en el futuro. Información sobre FreeBSD: Por lo general Wine no funcionará correctamente en versiones anteriores a - FreeBSD 8.0. Visite http://wiki.freebsd.org/Wine para más información. + FreeBSD 8.0. Visite https://wiki.freebsd.org/Wine para más información. Información sobre Solaris: Lo más probable es que necesite compilar con el conjunto de herramientas GNU @@ -77,14 +77,14 @@ Requisitos básicos: Librerías de soporte adicionales: Configure mostrará advertencias cuando las librerías opcionales no se encuentren disponibles en su sistema. - Visite http://wiki.winehq.org/Recommended_Packages para recomendaciones + Visite https://wiki.winehq.org/Recommended_Packages para recomendaciones acerca de que paquetes debe instalar. En plataformas de 64-bit, si se está compilando Wine 32-bits (es la compilación por defecto), debe estar seguro de tener instaladas las librerías - de desarrollo de 32-bits; visite http://wiki.winehq.org/WineOn64bit para más + de desarrollo de 32-bits; visite https://wiki.winehq.org/WineOn64bit para más detalles. Si usted desea un entorno Wine 64-bits puro (o una mezcla de 32-bits - y 64-bits), vaya a http://wiki.winehq.org/Wine64 para más detalles. + y 64-bits), vaya a https://wiki.winehq.org/Wine64 para más detalles. 4. COMPILACIÓN @@ -114,7 +114,7 @@ crear conflictos. Realice un "dpkg -r wine" o "rpm -e wine" o "make uninstall" antes de instalar. Una vez instalado, puede ejecutar la herramienta de configuración "winecfg". -Visite la zona de Soporte en http://www.winehq.org/ para consejos sobre la +Visite la zona de Soporte en https://www.winehq.org/ para consejos sobre la configuración. @@ -144,18 +144,18 @@ recibirá un log de error que debe adjuntar en caso de reportar un fallo. 7. OBTENIENDO MÁS INFORMACIÓN WWW: Una gran cantidad de información sobre Wine está disponible en WineHQ - en http://www.winehq.org/ : varias guías de Wine, base de datos de + en https://www.winehq.org/ : varias guías de Wine, base de datos de aplicaciones, registro de bugs. Este es probablemente el mejor punto de partida. FAQ: Las preguntas frecuentes de Wine se encuentran en - http://www.winehq.org/FAQ + https://www.winehq.org/FAQ Listas de correo: Hay varias listas de correo, tanto para usuarios como desarrolladores; - Vaya a http://www.winehq.org/forums para más información. + Vaya a https://www.winehq.org/forums para más información. -Bugs: Reporte fallos en el Bugzilla de Wine, http://bugs.winehq.org +Bugs: Reporte fallos en el Bugzilla de Wine, https://bugs.winehq.org Por favor, antes de enviar un informe de fallo busque en la base de datos de bugzilla para comprobar si su problema es un fallo conocido o existe una solución. @@ -163,7 +163,7 @@ Bugs: Reporte fallos en el Bugzilla de Wine, http://bugs.winehq.org IRC: Se puede obtener ayuda online en el canal #WineHQ de irc.freenode.net. Git: El árbol actual de desarrollo de Wine está disponible a través de Git. - Vaya a http://www.winehq.org/git para más información. + Vaya a https://www.winehq.org/git para más información. Si añade algo, o corrige algún bug, por favor envíe un parche (en formato git-format-patch) a la lista wine-devel(a)winehq.org para su inclusión diff --git a/documentation/README.fi b/documentation/README.fi index ae167ee800..30311d8280 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -28,7 +28,7 @@ Tai aja se käännöshakemistosta: Ohjelmat ajetaan komennolla "wine ohjelma". Lisätietoja sekä apua ongelmien ratkaisemiseen on jäljempänä tässä tiedostossa, Winen man-sivuilla sekä -ennen kaikkea Internetissä osoitteessa http://www.winehq.org/. +ennen kaikkea Internetissä osoitteessa https://www.winehq.org/. 3. JÄRJESTELMÄVAATIMUKSET @@ -47,7 +47,7 @@ muillekin käyttöjärjestelmille, joissa on tarvittava tuki säikeille. Tietoa FreeBSD:lle: Pääsääntöisesti Wine ei toimi vanhemmilla versioilla kuin FreeBSD 8.0. - Osoitteessa http://wiki.freebsd.org/Wine kerrotaan tästä lisää. + Osoitteessa https://wiki.freebsd.org/Wine kerrotaan tästä lisää. Tietoa Solarikselle: Wine täytyy luultavasti kääntää GNU-työkaluilla (gcc, gas jne.). @@ -79,7 +79,7 @@ Perusvaatimukset: Valinnaisia tukikirjastoja: configure-skripti näyttää varoituksia, kun valinnaisia kirjastoja puuttuu. - Osoitteessa http://wiki.winehq.org/Recommended_Packages on tietoa, mitkä + Osoitteessa https://wiki.winehq.org/Recommended_Packages on tietoa, mitkä paketit ovat hyödyksi. 64-bittisissä järjestelmissä täytyy varmistaa, että kirjastoista on asennettu 32-bittiset versiot. @@ -111,7 +111,7 @@ Ennen asennusta pitää muistaa poistaa aiemmat Winen versiot. Poistamista voi yrittää komennolla "dpkg -r wine", "rpm -e wine" tai "make uninstall". Kun Wine on asennettu, voidaan ajaa asetusohjelma "winecfg". Sivustolla -http://www.winehq.org/ kohdassa Support on englanninkielisiä lisäohjeita. +https://www.winehq.org/ kohdassa Support on englanninkielisiä lisäohjeita. 6. OHJELMIEN AJAMINEN @@ -136,28 +136,28 @@ mukaan, jos raportoi virheestä. 7. LISÄTIETOJA -WWW: Winestä on paljon tietoa WineHQ:ssa, http://www.winehq.org/. +WWW: Winestä on paljon tietoa WineHQ:ssa, https://www.winehq.org/. Oppaita, ohjelmatietokanta sekä Bugzilla vikojen listaamiseen. Täältä kannattaa yleensä aloittaa. Kysymyksiä: - Sivulle http://www.winehq.org/FAQ on koottu kysymyksiä ja vastauksia. + Sivulle https://www.winehq.org/FAQ on koottu kysymyksiä ja vastauksia. -Wiki: Wine Wiki on osoitteessa http://wiki.winehq.org/. +Wiki: Wine Wiki on osoitteessa https://wiki.winehq.org/. Postituslistat: Winen käyttäjille ja kehittäjille on joitakin postituslistoja, - sivulla http://www.winehq.org/forums kerrotaan niistä lisää. + sivulla https://www.winehq.org/forums kerrotaan niistä lisää. Virheet: - Ilmoita virheistä Winen Bugzillaan, http://bugs.winehq.org/. + Ilmoita virheistä Winen Bugzillaan, https://bugs.winehq.org/. Katso kuitenkin ensin Bugzilla-tietokannasta, onko samasta asiasta ilmoitettu jo aiemmin. IRC: Online-apua voi saada kanavalta #WineHQ palvelimella irc.freenode.net. Git: Winen tämänhetkinen kehitysversio on jaossa Git-järjestelmän kautta. - Sivulla http://www.winehq.org/git kerrotaan tästä lisää. + Sivulla https://www.winehq.org/git kerrotaan tästä lisää. Jos lisäät jotain tai korjaat jonkin virheen, lähetä toki muutoksesi diff --git a/documentation/README.fr b/documentation/README.fr index d42d20a02c..28729a5b41 100644 --- a/documentation/README.fr +++ b/documentation/README.fr @@ -23,7 +23,7 @@ make Pour exécuter un programme, tapez « wine programme ». Pour des informations complémentaires et la résolutions de problèmes, lisez la suite de ce fichier, les pages de manuel de Wine, et surtout les nombreuses -informations que vous trouverez sur http://www.winehq.org. +informations que vous trouverez sur https://www.winehq.org. 3. CONFIGURATION NÉCESSAIRE @@ -45,7 +45,7 @@ futur. Informations FreeBSD : Wine ne fonctionnera généralement pas bien avec les versions FreeBSD - antérieures à 8.0. Voyez http://wiki.freebsd.org/Wine pour plus + antérieures à 8.0. Voyez https://wiki.freebsd.org/Wine pour plus d'informations. Informations Solaris : @@ -85,14 +85,14 @@ Configuration de base requise : Bibliothèques optionnelles : « configure » affiche des messages quand des bibliothèques optionnelles ne sont pas détectées sur votre système. - Consultez http://wiki.winehq.org/Recommended_Packages (en anglais) pour + Consultez https://wiki.winehq.org/Recommended_Packages (en anglais) pour des indications sur les paquets logiciels que vous devriez installer. Sur les plates-formes 64 bits, si vous compilez Wine pour le mode 32 bits (mode par défaut), les versions 32 bits de ces bibliothèques doivent être - installées. Voyez http://wiki.winehq.org/WineOn64bit pour les détails. + installées. Voyez https://wiki.winehq.org/WineOn64bit pour les détails. Si vous désirez un Wine 64 bits pur (ou une configuration mixte - 32/64 bits), consultez http://wiki.winehq.org/Wine64. + 32/64 bits), consultez https://wiki.winehq.org/Wine64. 4. COMPILATION @@ -125,7 +125,7 @@ d'installer une nouvelle version. Une fois l'installation terminée, vous pouvez lancer l'outil de configuration « winecfg ». Consultez la section Support de -http://www.winehq.org/ pour obtenir des astuces de configuration. +https://www.winehq.org/ pour obtenir des astuces de configuration. 6. EXÉCUTER DES PROGRAMMES @@ -156,22 +156,22 @@ d'attacher à un éventuel rapport de bogue. 7. SOURCES D'INFORMATIONS COMPLÉMENTAIRES WWW : Beaucoup d'informations à propos de Wine sont disponibles sur - WineHQ (http://www.winehq.org) : divers guides, base de données + WineHQ (https://www.winehq.org) : divers guides, base de données d'applications, suivi de bogues. C'est probablement le meilleur point de départ. FAQ : La Foire aux Questions de Wine se trouve sur - http://www.winehq.org/FAQ + https://www.winehq.org/FAQ -Wiki : Le wiki Wine est situé sur http://wiki.winehq.org +Wiki : Le wiki Wine est situé sur https://wiki.winehq.org Listes de diffusion : Il existe plusieurs listes de diffusion pour les utilisateurs et - les développeurs Wine ; voyez http://www.winehq.org/forums pour de + les développeurs Wine ; voyez https://www.winehq.org/forums pour de plus amples informations. Bogues : - Signalez les bogues sur le Bugzilla Wine à http://bugs.winehq.org + Signalez les bogues sur le Bugzilla Wine à https://bugs.winehq.org Merci de vérifier au préalable dans la base de données de bugzilla que le problème n'est pas déjà connu, ou corrigé. @@ -179,7 +179,7 @@ IRC : L'aide en ligne est disponible via le canal #WineHQ sur irc.freenode.net. Git : L'arbre de développement actuel de Wine est disponible via Git. - Voyez http://www.winehq.org/git pour plus d'informations. + Voyez https://www.winehq.org/git pour plus d'informations. Si vous ajoutez quelque chose ou corrigez un bogue, merci d'envoyer un correctif (de préférence en utilisant git-format-patch) à la liste de diff --git a/documentation/README.hu b/documentation/README.hu index ca99d9b325..f672dea43d 100644 --- a/documentation/README.hu +++ b/documentation/README.hu @@ -23,7 +23,7 @@ könyvtárából (ami tartalmazza ezt a fájlt), futtassa: A programok futtatása "wine [opciók] program". A további információkhoz és a probléma felvilágosításhoz olvassa el ennek a fájlnak a további részét, a Wine man oldalát, és különösen gazdag információ található itt: -http://www.winehq.org. +https://www.winehq.org. 3. KÖVETELMÉNYEK @@ -130,7 +130,7 @@ Elõször ne felejtse eltávolítani bármely elõzõ Wine telepítést. Próbálja ki a "dpkg -r wine", és az "rpm -e wine", vagy a "make uninstall" parancsot telepítés elõtt. -Látogassa meg a támogatási oldalt itt: http://www.winehq.org/ a konfigurációs +Látogassa meg a támogatási oldalt itt: https://www.winehq.org/ a konfigurációs tippekhez. Függvénykönyvtár betöltési hibák esetén @@ -176,16 +176,16 @@ http://home.nexgo.de/andi.mohr/download/decorrupt_explorer 7. TÖBB INFORMÁCIÓ BESZERZÉSE WWW: A Wine-ról hatalmas mennyiségû információ érhetõ el a WineHQ-n ezen - a címen: http://www.winehq.org/ : különbözõ Wine útmutatók, + a címen: https://www.winehq.org/ : különbözõ Wine útmutatók, alkalmazás adatbázis, és hibakövetés. Ez talán a legjobb kiindulási pont. -GYIK: A Wine GYIK itt található: http://www.winehq.org/FAQ +GYIK: A Wine GYIK itt található: https://www.winehq.org/FAQ Usenet: Társaloghat a Wine-hoz kapcsolódó témákban, és segítséget kérhet itt: comp.emulators.ms-windows.wine. -Hibák: Wine hibabejelentés a Bugzilla-n keresztül itt: http://bugs.winehq.org +Hibák: Wine hibabejelentés a Bugzilla-n keresztül itt: https://bugs.winehq.org Kérem hibabejelentés küldése elõtt ellenõrizze, hogy az ön problémája már megtalálható-e az adatbázisban. Küldhet hibabejelentéseket a comp.emulators.ms-windows.wine címre is. @@ -193,11 +193,11 @@ Hibák: Wine hibabejelentés a Bugzilla-n keresztül itt: http://bugs.winehq.org IRC: Azonnali segítség elérhetõ a #WineHQ csatornán a irc.freenode.net-en. Git: A jelenlegi Wine fejlesztõi fa elérhetõ Git-en keresztül. - Látogasson el ide a további információhoz: http://www.winehq.org/git + Látogasson el ide a további információhoz: https://www.winehq.org/git Levelezõlisták: Elérhetõ néhány levelezõlista a Wine fejlesztõk számára; nézze meg a - http://www.winehq.org/forums címet a további információhoz. + https://www.winehq.org/forums címet a további információhoz. Ha valamit hozzáad, vagy hibát javít, kérem küldjön javítófoltot ('diff -u' formátumban) a wine-devel(a)winehq.org levelezõlista címre, hogy beletehessük a diff --git a/documentation/README.it b/documentation/README.it index 0c2bcd8511..ecb4aed75e 100644 --- a/documentation/README.it +++ b/documentation/README.it @@ -23,7 +23,7 @@ Wine, eseguire: Eseguire i programmi com "wine programma". Per maggiori informazioni e risoluzioni di problemi, leggere il resto di questo file, la pagina man di Wine, ed in modo particolare la notevole quantità di informazioni che -si trova all'indirizzo http://www.winehq.org. +si trova all'indirizzo https://www.winehq.org. 3. REQUISITI @@ -43,7 +43,7 @@ che forniscono kernel threads potrebbero essere supportati in futuro. Informazioni per FreeBSD: In generale Wine non funzionerà correttamente con versioni precedenti a FreeBSD 8.0. - Leggere http://wiki.freebsd.org/Wine per maggiori informazioni. + Leggere https://wiki.freebsd.org/Wine per maggiori informazioni. Informazioni per Solaris: Sarà molto probabilmente necessario compilare Wine con i tool GNU @@ -76,14 +76,14 @@ Requisiti basilari: Librerie opzionali di supporto: Configure notificherà a video quando le librerie opzionali non sono - trovate sul sistema. Leggere http://wiki.winehq.org/Recommended_Packages + trovate sul sistema. Leggere https://wiki.winehq.org/Recommended_Packages per suggerimenti sui pacchetti da installare. Su piattaforme a 64-bit, per compilare Wine a 32-bit (predefinito), assicurarsi di installare la versione a 32-bit di queste librerie; - leggere http://wiki.winehq.org/WineOn64bit per i dettagli. Per avere + leggere https://wiki.winehq.org/WineOn64bit per i dettagli. Per avere Wine solo 64-bit (o un setup di Wine misto tra 32-bit e 64-bit), - leggere http://wiki.winehq.org/Wine64 per maggiori informazioni. + leggere https://wiki.winehq.org/Wine64 per maggiori informazioni. 4. COMPILAZIONE @@ -114,7 +114,7 @@ di Wine in conflitto. Prova sia "dpkg -r wine" o "rpm -e wine" o "make uninstall" prima di installare. Una volta installato, esegui lo strumento di configurazione "winecfg". -Leggi l'area Support su http://www.winehq.org/ per suggerimenti sulla +Leggi l'area Support su https://www.winehq.org/ per suggerimenti sulla configurazione. @@ -142,19 +142,19 @@ di segnalazione del problema. 7. PER OTTENERE PIÙ INFORMAZIONI WWW: Un gran quantitativo di informazioni su Wine è disponibile al - WineHQ, http://www.winehq.org/: varie guide su Wine, database + WineHQ, https://www.winehq.org/: varie guide su Wine, database delle applicazioni, rintracciamento di bug. Questo è probabilmente il miglior punto di partenza. -FAQ: Le FAQ di Wine si trovano all'indirizzo http://www.winehq.org/FAQ +FAQ: Le FAQ di Wine si trovano all'indirizzo https://www.winehq.org/FAQ -Wiki: Il Wiki di Wine si trova all'indirizzo http://wiki.winehq.org +Wiki: Il Wiki di Wine si trova all'indirizzo https://wiki.winehq.org Mailing list: Esistono diverse mailing list per utenti e sviluppatori di Wine; - visitare http://www.winehq.org/forums per ulteriori informazioni. + visitare https://www.winehq.org/forums per ulteriori informazioni. -Bugs: Segnalare i bug su Wine Bugzilla all'indirizzo http://bugs.winehq.org +Bugs: Segnalare i bug su Wine Bugzilla all'indirizzo https://bugs.winehq.org Si prega di controllare il database di Bugzilla per verificare che il problema non sia già conosciuto o risolto prima di creare un rapporto su di esso. @@ -162,7 +162,7 @@ Bugs: Segnalare i bug su Wine Bugzilla all'indirizzo http://bugs.winehq.org IRC: Aiuto online disponibile nel canale #WineHQ su irc.freenode.net. Git: L'albero attuale di sviluppo di Wine è disponibile attraverso Git. - Vedere http://www.winehq.org/git per maggiori informazioni. + Vedere https://www.winehq.org/git per maggiori informazioni. Se aggiungi qualcosa, o correggi un bug, si prega di mandare una patch (preferibilmente usando git-format-patch) alla mailing list diff --git a/documentation/README.ja b/documentation/README.ja index ae21f73dcd..9b44353306 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -21,7 +21,7 @@ make "wine program"のようにプログラムを実行してください。更なる情報や問題解決については、このファイルの残りの部分、Wineのmanページや、 -特にhttp://www.winehq.orgで見つかる豊富な情報を読んでください。 +特にhttps://www.winehq.orgで見つかる豊富な情報を読んでください。 3. 要件 @@ -41,7 +41,7 @@ Wineをコンパイルし実行するには、以下のうち一つを持って FreeBSD情報: Wineは一般的にFreeBSD 8.0より前のバージョン上で正しく動作しないでしょう。 - 詳細については http://wiki.freebsd.org/Wine を参照してください。 + 詳細については https://wiki.freebsd.org/Wine を参照してください。 Solaris情報: GNUツールチェーン（gcc、gasなど）でWineをビルドする必要がある可能性が @@ -77,7 +77,7 @@ Mac OS X情報: オプションのサポートライブラリ: configureはオプションのライブラリがシステム上に見つからなかったときに通知を表示します。インストールすべきパッケージについてのヒントについては - http://wiki.winehq.org/Recommended_Packagesを参照してください。64ビットプ + https://wiki.winehq.org/Recommended_Packagesを参照してください。64ビットプラットフォームでは、これらライブラリの32ビットバージョンをインストールしたことをよく確認してください。 @@ -110,7 +110,7 @@ make または"make uninstall"を試してください。いったんインストールされると、"winecfg"設定ツールを実行できます。 -設定のヒントについてはhttp://www.winehq.org/におけるサポート領域を +設定のヒントについてはhttps://www.winehq.org/におけるサポート領域を参照してください。 @@ -137,26 +137,26 @@ Wineは完璧ではないので、いくつかのプログラムはクラッシ 7. 更なる情報の取得 -WWW: Wineについてのたくさんの情報がhttp://www.winehq.org/にある +WWW: Wineについてのたくさんの情報がhttps://www.winehq.org/にある WineHQから入手できます。多様なWineガイド、アプリケーションデータベース、バグ追跡。これはおそらく最良の出発点です。 -FAQ: Wine FAQはhttp://www.winehq.org/FAQにあります +FAQ: Wine FAQはhttps://www.winehq.org/FAQにあります -Wiki: Wine Wikiはhttp://wiki.winehq.orgにあります +Wiki: Wine Wikiはhttps://wiki.winehq.orgにありますメーリングリスト: Wineユーザと開発者のためのいくつかのメーリングリストがあります。 - 詳細についてはhttp://www.winehq.org/forumsを参照してください。 + 詳細についてはhttps://www.winehq.org/forumsを参照してください。 -バグ: http://bugs.winehq.orgにあるWine Bugzillaでバグを報告してください。 +バグ: https://bugs.winehq.orgにあるWine Bugzillaでバグを報告してください。バグ報告を投稿する前に問題が既知や修正済みかどうかを調べるために bugzillaデータベースを検索してください。 IRC: irc.freenode.net上のチャンネル#WineHQでオンラインヘルプを利用できます。 Git: 現在のWine開発ツリーはGitを通して入手できます。 - 詳細についてはhttp://www.winehq.org/gitに行ってください。 + 詳細についてはhttps://www.winehq.org/gitに行ってください。何かを追加するか、バグを修正するならば、次のリリースに含めるためにパッチ（git-format-patchをなるべく使用）をwine-devel(a)winehq.xn--org-eb4bpa2au41dheqot743g diff --git a/documentation/README.ko b/documentation/README.ko index a0fdcb045e..79b686c6d5 100644 --- a/documentation/README.ko +++ b/documentation/README.ko @@ -20,7 +20,7 @@ LICENSE 파일을 참조하십시오. 프로그램을 실행할 때는 "wine 프로그램명"처럼 합니다. 더 자세한 정보 및 문제 해결 방법은 이 파일의 나머지 부분과 Wine 맨페이지를 참조하십시오. -특히 http://www.winehq.org 사이트에 방대한 정보가 집약되어 있습니다. +특히 https://www.winehq.org 사이트에 방대한 정보가 집약되어 있습니다. 3. 빌드에 필요한 조건 @@ -126,7 +126,7 @@ Wine이 일단 정상적으로 빌드된 다음에는 "make install" 명령으 바랍니다. "dpkg -r wine" 또는 "rpm -e wine" 또는 "make uninstall" 등의 명령으로 이전 버전을 제거할 수 있습니다. -설정 관련 도움말은 http://www.winehq.org/의 Support 페이지에 있습니다. +설정 관련 도움말은 https://www.winehq.org/의 Support 페이지에 있습니다. 라이브러리 로딩 에러("Error while loading shared libraries: libntdll.so")가 발생하는 경우 라이브러리 경로가 /etc/ld.so.conf 파일 안에 지정되어 있는지 @@ -159,15 +159,15 @@ Wine은 아직 완성 단계에 도달하지 못했기 때문에 프로그램이 7. 더 자세한 정보 WWW: 여러 종류의 Wine 가이드, 애플리케이션 데이터베이스, 버그 추적 등 - http://www.winehq.org/ 에 있는 WineHQ 사이트에 가면 많은 정보를 얻을 + https://www.winehq.org/ 에 있는 WineHQ 사이트에 가면 많은 정보를 얻을 수 있습니다. 정보를 찾을 때 대개 이 사이트가 출발점이 됩니다. -FAQ: Wine FAQ은 http://www.winehq.org/FAQ 에 있습니다. +FAQ: Wine FAQ은 https://www.winehq.org/FAQ 에 있습니다. Usenet: Wine 관련 주제를 논의하거나 도움을 받으려면 comp.emulators.ms-windows.wine 그룹을 이용하기 바랍니다. -Bugs: http://bugs.winehq.org 의 Wine Bugzilla에 버그를 보고하십시오. +Bugs: https://bugs.winehq.org 의 Wine Bugzilla에 버그를 보고하십시오. 버그 보고서를 제출하기 전 같은 문제가 이미 제출된 적이 있는지 데이터베이스 검색을 통해 확인하기 바랍니다. comp.emulators.ms-windows.wine 그룹에 버그 보고서를 올려도 됩니다. @@ -175,13 +175,13 @@ Bugs: http://bugs.winehq.org 의 Wine Bugzilla에 버그를 보고하십시오 IRC: irc.freenode.net 의 #WineHQ 채널에서 도움을 받을 수 있습니다. GIT: Wine 개발 트리는 현재 GIT로 관리되고 있습니다. 더 자세한 정보는 - http://www.winehq.org/site/git 를 참조하기 바랍니다. + https://www.winehq.org/site/git 를 참조하기 바랍니다. 메일링 리스트: Wine 사용자와 개발자를 위해 메일링 리스트가 운영되고 있습니다. - 더 자세한 정보는 http://www.winehq.org/forums 를 참조하기 바랍니다. + 더 자세한 정보는 https://www.winehq.org/forums 를 참조하기 바랍니다. -위키: Wine 위키는 http://wiki.winehq.org 에 있습니다. +위키: Wine 위키는 https://wiki.winehq.org 에 있습니다. 추가할 내용이나 수정할 버그가 있다면 다음번 릴리스에 포함될 수 있도록 wine-devel(a)winehq.org 메일링 리스트로 패치('diff -u' 형식으로 된)를 보내 diff --git a/documentation/README.no b/documentation/README.no index 5c42500045..443515e255 100644 --- a/documentation/README.no +++ b/documentation/README.no @@ -20,7 +20,7 @@ rotkatalogen til Wine-kildekoden ./tools/wineinstall Kjør programmer som «wine program». Se resten av denne filen, -Wines man-side og http://www.winehq.org/ for mer informasjon og +Wines man-side og https://www.winehq.org/ for mer informasjon og problemløsing. @@ -40,7 +40,7 @@ støtter kjernetråder støttes kanskje i framtiden. Informasjon for FreeBSD: Wine vil som regel ikke virke på FreeBSD-versjoner eldre enn 8.0. - Se <http://wiki.freebsd.org/Wine> for mer informasjon. + Se <https://wiki.freebsd.org/Wine> for mer informasjon. Informsjon for Solaris: Wine må antakelig bygges med GNU-verktøyene (gcc, gas etc.). @@ -72,15 +72,15 @@ Basiskrav: Valgfrie støttebiblioteker: configure-skriptet viser meldinger når valgfrie biblioteker ikke blir - funnet. Se http://wiki.winehq.org/Recommended_Packages for info om + funnet. Se https://wiki.winehq.org/Recommended_Packages for info om hvilke pakker du bør installere. På 64 bit-systemer trenger du 32 bit-versjoner av disse bibliotekene hvis du skal bygge Wine som et 32 bit-program (standard); - se http://wiki.winehq.org/WineOn64bit for flere detaljer. + se https://wiki.winehq.org/WineOn64bit for flere detaljer. Hvis du ønsker å bygge Wine som et 64 bit-program (eller et oppsett med blandet 32 bit og 64 bit) kan du lese mer på - http://wiki.winehq.org/Wine64 + https://wiki.winehq.org/Wine64 4. BYGGING @@ -105,7 +105,7 @@ Ikke glem å avinstallere tidligere Wine-versjoner først. Prøv enten «dpkg -r wine», «rpm -e wine» eller «make uninstall» før installsjonen. Når Wine er installert kan du bruke oppsettsverktøyet «winecfg». -Se støtteområdet på http://www.winehq.org/ for hint om oppsett. +Se støtteområdet på https://www.winehq.org/ for hint om oppsett. 6. KJØRING AV PROGRAMMER @@ -134,18 +134,18 @@ når du rapporterer en feil. 7. MER INFORMASJON Internett: En god del informasjon om Wine finnes hos WineHQ på - http://www.winehq.org/ : diverse veiledere, en programdatabase + https://www.winehq.org/ : diverse veiledere, en programdatabase og feilsporing. Dette er antakelig det beste stedet å begynnne. -Svar: Wines spørsmål og svar finnes på http://www.winehq.org/FAQ +Svar: Wines spørsmål og svar finnes på https://www.winehq.org/FAQ -Wiki: Wines Wiki er tilgjengelig på http://wiki.winehq.org +Wiki: Wines Wiki er tilgjengelig på https://wiki.winehq.org E-postlister: Det finnes flere e-postlister for Wine-utviklere og -brukere; - besøk http://www.winehq.org/forums for mer informasjon. + besøk https://www.winehq.org/forums for mer informasjon. -Feil: Rapporter feil til Wines Bugzilla på http://bugs.winehq.org +Feil: Rapporter feil til Wines Bugzilla på https://bugs.winehq.org Søk i Bugzilla-databasen og se om probelmet allerede er funnet før du sender en feilrapport. @@ -153,7 +153,7 @@ IRC: Nødhjelp er tilgjengelig på kanalen #WineHQ på irc.freenode.net. Git: Wines oppdaterte utvikler-versjon er tilgjengelig gjennom GIT. - Gå til http://www.winehq.org/git for mer informasjon. + Gå til https://www.winehq.org/git for mer informasjon. Hvis du legger til noe eller fikser en feil er det fint som du sender en oppdateringsfil (helst laget med git format-patch) til listen diff --git a/documentation/README.pt b/documentation/README.pt index 3f3ff2cc5e..848d2d2eb2 100644 --- a/documentation/README.pt +++ b/documentation/README.pt @@ -21,7 +21,7 @@ do Wine source (que contém este ficheiro),corre: Corre os programas conforme as "wine [options] program". Para mais informações e resoçução de problemas. Lê o resto deste ficheiro, a Wine man page, e especialmente a abundância de informação encontrada em -http://www.winehq.org. +https://www.winehq.org. 3.REQUERIMENTOS @@ -130,7 +130,7 @@ instalação do Wine. Tenta outro "dpkg -r wine" ou "rpm -e wine" ou "make uninstall" antes de installar. -Ver http://www.winehq.org/support/ para informação sobre a +Ver https://www.winehq.org/support/ para informação sobre a configuraçao. No caso da livraria carregar erros (e.g. "Error while loading shared @@ -185,11 +185,11 @@ http://home.nexgo.de/andi.mohr/download/decorrupt_explorer 7.ARRANJAR MAIS INFORMAÇÃO www: Uma grande quantidade de informação acerca do Wine está disponivel - pelo WineHQ em http://www.winehq.org/ : varios guias Wine, base de + pelo WineHQ em https://www.winehq.org/ : varios guias Wine, base de dados de aplicações, localizaçao de erros. Isto é provavelmente o melhor ponto de começo. -FAQ: A Wine FAQ está localizada em http://www.winehq.org/FAQ +FAQ: A Wine FAQ está localizada em https://www.winehq.org/FAQ Usenet: Tu podes discutor tópicos relacionados de Wine e obter ajuda em comp.emulators.ms-windows.wine. @@ -198,11 +198,11 @@ IRC: Ajuda online está disponivel em #WineHQ on irc.freenode.net. Git: O currente desenvolvimento do Wine está disponivel por Git. - Vai a http://www.winehq.org/git para mais informação. + Vai a https://www.winehq.org/git para mais informação. Mailing Lists: Há algumas mailing list para responsaveis pelo desenvolvimento Wine; ver em - http://www.winehq.org/forums para mais informação. + https://www.winehq.org/forums para mais informação. Se tu acrescentaste algo,ou corrigiste um bug, por favor envia um patch (em 'diff -u' format) para wine-devel(a)winehq.org lista para inclusão diff --git a/documentation/README.pt_br b/documentation/README.pt_br index 01e0be773a..05a3d037bd 100644 --- a/documentation/README.pt_br +++ b/documentation/README.pt_br @@ -23,7 +23,7 @@ nível do código fonte do Wine, execute: Execute programas conforme "wine programa". Para maiores informações e resolução de problemas, leia o restante deste arquivo, a página "man" do Wine (man wine), e especialmente a abundância de informação -encontrada em http://www.winehq.org. +encontrada em https://www.winehq.org. 3. REQUERIMENTOS @@ -43,7 +43,7 @@ ter suporte no futuro. Informações para o FreeBSD: O Wine em geral não deve funcionar corretamente em versões antes da 8.0. - Veja http://wiki.freebsd.org/Wine para mais informações. + Veja https://wiki.freebsd.org/Wine para mais informações. Informações para o Solaris: Você provavelmente necessitará construir o Wine com as ferramentas GNU @@ -77,14 +77,14 @@ Requisitos básicos: Bibliotecas de suporte opcionais: O script configure irá mostrar diversas mensagens quando bibliotecas opcionais não forem encontradas no seu sistema. - Veja http://wiki.winehq.org/Recommended_Packages para dicas sobre + Veja https://wiki.winehq.org/Recommended_Packages para dicas sobre pacotes que você pode instalar. Em plataformas de 64 bits, se compilar Wine como 32 bits (padrão), você precisa assegurar que as versões 32 bits das bibliotecas estão instaladas, - veja http://wiki.winehq.org/WineOn64bit para mais detalhes. + veja https://wiki.winehq.org/WineOn64bit para mais detalhes. Se você quer um verdadeiro Wine de 64 bits (ou uma configuração mista de - 32 e 64 bits) veja http://wiki.winehq.org/Wine64 para mais detalhes. + 32 e 64 bits) veja https://wiki.winehq.org/Wine64 para mais detalhes. 4. COMPILAÇÃO @@ -114,7 +114,7 @@ Wine que possa ser conflitante. Tente tanto "dpkg -r wine", "rpm -e wine" ou "make uninstall" antes de instalar. Depois de instalado, pode-se executar o programa de configuração "winecfg". -Veja a área de suporte em http://www.winehq.org/ para dicas de configuração. +Veja a área de suporte em https://www.winehq.org/ para dicas de configuração. 6. EXECUTANDO PROGRAMAS @@ -142,20 +142,20 @@ poderá anexar ao bug que for criar. 7. OBTENDO MAIS INFORMAÇÃO WWW: Uma grande quantidade de informação sobre o Wine está disponível - no WineHQ em http://www.winehq.org/ : vários guias do Wine, base + no WineHQ em https://www.winehq.org/ : vários guias do Wine, base de dados de aplicações, rastreamento de erros. Este é provavelmente o melhor ponto para começar. -FAQ: O FAQ (perguntas frequentes) do Wine está em http://www.winehq.org/FAQ +FAQ: O FAQ (perguntas frequentes) do Wine está em https://www.winehq.org/FAQ -Wiki: O wiki do Wine está disponível em http://wiki.winehq.org +Wiki: O wiki do Wine está disponível em https://wiki.winehq.org Listas de discussão: Há diversas listas de mensagens para usuários e colaboradores no - desenvolvimento do Wine; veja http://www.winehq.org/forums para + desenvolvimento do Wine; veja https://www.winehq.org/forums para mais informação. -Bugs: Relate erros ao Bugzilla do Wine em http://bugs.winehq.org +Bugs: Relate erros ao Bugzilla do Wine em https://bugs.winehq.org Por favor, pesquise a base de dados do bugzilla para verificar se seu problema já foi encontrado ou resolvido antes de enviar um relatório do erro. @@ -163,7 +163,7 @@ Bugs: Relate erros ao Bugzilla do Wine em http://bugs.winehq.org IRC: A ajuda online está disponível em #WineHQ em irc.freenode.net. Git: A árvore de desenvolvimento atual do Wine está disponível por Git. - Visite http://www.winehq.org/git para mais informação. + Visite https://www.winehq.org/git para mais informação. Se você alterar algo ou reparar um erro, envie, por favor, um patch (preferencialmente usando git-format-patch) à lista wine-devel(a)winehq.org diff --git a/documentation/README.ru b/documentation/README.ru index 5c068cc6ff..5276b99bd9 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -20,7 +20,7 @@ make Запустите программу с помощью команды «wine имя_программы». Источники дополнительной информации перечислены в конце этого файла. Ознакомьтесь с -руководством по Wine, а также с сайтом http://www.winehq.org. +руководством по Wine, а также с сайтом https://www.winehq.org. 3. ТРЕБОВАНИЯ @@ -40,7 +40,7 @@ make FreeBSD: Wine не будет работать как следует на версиях ниже, чем FreeBSD 8.0. - Посетите <http://wiki.freebsd.org/Wine> для дополнительной информации. + Посетите <https://wiki.freebsd.org/Wine> для дополнительной информации. Solaris: Лучше всего компоновать Wine инструментами GNU @@ -74,7 +74,7 @@ Mac OS X: Дополнительные библиотеки: Конфигурационный скрипт выведет список дополнительных библиотек, которые не были найдены в вашей системе. Ознакомьтесь с перечнем необходимых пакетов по адресу - http://wiki.winehq.org/Recommended_Packages. При работе на 64-битных платформах + https://wiki.winehq.org/Recommended_Packages. При работе на 64-битных платформах убедитесь, что у вас установлены 32-битные версии этих библиотек. 4. КОМПИЛЯЦИЯ @@ -105,7 +105,7 @@ make Попробуйте «dpkg -r wine», «rpm -e wine» или «make uninstall» до установки. После установки запустите конфигурационную программу «winecfg». Посетите -Службу поддержки на http://www.winehq.org/, если возникнут вопросы по конфигурации. +Службу поддержки на https://www.winehq.org/, если возникнут вопросы по конфигурации. 6. ЗАПУСК ПРОГРАММ @@ -132,25 +132,25 @@ Wine не идеален, поэтом некоторые программы м 7. ПОЛУЧЕНИЕ ДОПОЛНИТЕЛЬНОЙ ИНФОРМАЦИИ WWW: Много информации о Wine доступно в WineHQ на - http://www.winehq.org/: различные руководства Wine, база данных приложений, + https://www.winehq.org/: различные руководства Wine, база данных приложений, база данных ошибок. Вероятно лучше всего начать с этого сайта. -FAQ: Wine FAQ расположен на http://www.winehq.org/FAQ +FAQ: Wine FAQ расположен на https://www.winehq.org/FAQ -Wiki: Wine Wiki расположен на http://wiki.winehq.org +Wiki: Wine Wiki расположен на https://wiki.winehq.org Рассылки: Имеется несколько рассылок для пользователей и разработчиков Wine, - обратитесь по адресу http://www.winehq.org/forums за дополнительной информацией. + обратитесь по адресу https://www.winehq.org/forums за дополнительной информацией. -Ошибки: Сообщайте об ошибках в Wine Bugzilla по адресу http://bugs.winehq.org +Ошибки: Сообщайте об ошибках в Wine Bugzilla по адресу https://bugs.winehq.org Прежде чем отправлять сообщение об ошибке проверьте, может эта ошибка уже известна или исправлена в последней версии Wine. IRC: Онлайн помощь доступна на канале #WineHQ на irc.freenode.net. Git: Текущие разработки Wine доступны через Git. - Смотрите http://www.winehq.org/site/git для дополнительной информации. + Смотрите https://www.winehq.org/site/git для дополнительной информации. Если вы что-то добавили или исправили ошибку, пожалуйста отправьте патч (предпочтительно сгенерированный с помощью git-format-patch) на wine-devel(a)winehq.org diff --git a/documentation/README.tr b/documentation/README.tr index f48422d2a2..28b17b8c37 100644 --- a/documentation/README.tr +++ b/documentation/README.tr @@ -21,7 +21,7 @@ Kur'u kullanmanız önerilir. Wine kaynak kodu içerisinde en üst dizine Programları "wine [seçenekler] program" şeklinde çalıştırabilirsiniz. Daha ayrıntılı bilgi ve sorun çözümü için, bu dosyanın geri kalanını, -Wine kullanım kılavuzunu ve özellikle http://www.winehq.org sitesindeki +Wine kullanım kılavuzunu ve özellikle https://www.winehq.org sitesindeki zengin bilgi arşivini tarayabilirsiniz. 3. GEREKSİNİMLER @@ -43,7 +43,7 @@ de gelecekte desteklenebilir. FreeBSD hakkında bilgi: Wine, FreeBSD 8.0'dan önceki sürümlerde genellikle düzgün çalışmaz. - Ayrıntılı bilgi için http://wiki.freebsd.org/Wine adresini ziyaret + Ayrıntılı bilgi için https://wiki.freebsd.org/Wine adresini ziyaret ediniz. Solaris hakkında bilgi: @@ -78,13 +78,13 @@ Temel gereksinimler: Seçeneğe bağlı destek kitaplıkları: Yapılandırılırken, eğer seçeneğe bağlı paketler bulunamadıysa, bildirim alacaksınız. Yüklemeniz gereken paketler hakkında ipuçları için, - http://wiki.winehq.org/Recommended_Packages adresini ziyaret ediniz. + https://wiki.winehq.org/Recommended_Packages adresini ziyaret ediniz. 64 bit üzerinde, eğer Wine'yi 32 bit (varsayılan) olarak derleyecekseniz, bazı kitaplıklarin 32 bit sürümlerinin yüklü olduğundan emin olunuz; - ayrıntılar için http://wiki.winehq.org/WineOn64bit adresini ziyaret + ayrıntılar için https://wiki.winehq.org/WineOn64bit adresini ziyaret ediniz. Eğer gerçek bir 64 bit Wine kurulumu (veya 32-64 bit karışık) - isterseniz, bilgi için http://wiki.winehq.org/Wine64 adresini ziyaret + isterseniz, bilgi için https://wiki.winehq.org/Wine64 adresini ziyaret ediniz. 4. DERLEME @@ -113,7 +113,7 @@ kılavuzunu ve gerekli birkaç dosyayı kuracaktır. uninstall" komutlarından birini deneyiniz. Yüklemeden sonra, "winecfg" yapılandıma aracını -çalıştırabilirsiniz. Yapılandırma ipuçları için http://www.winehq.org/ +çalıştırabilirsiniz. Yapılandırma ipuçları için https://www.winehq.org/ adresinde Destek bölümüne bakınız. 6. UYGULAMALARIN ÇALIŞTIRILMASI @@ -139,16 +139,16 @@ bildirirken eklemelisiniz. 7. DAHA FAZLA BİLGİYE ERİŞİM -WWW: Wine hakkında geniş bilgiyi WineHQ sitesine http://www.winehq.org/ +WWW: Wine hakkında geniş bilgiyi WineHQ sitesine https://www.winehq.org/ adresinden ulaşarak edinebilirsiniz: çeşitli Wine kılavuzları, uygulama veritabanı, hata izleme gibi. Burası muhtemelen en iyi başlangıç noktasıdır. SSS: Wine hakkında sıkça sorulan sorulara buradan ulaşabilirsiniz: - http://www.winehq.org/FAQ + https://www.winehq.org/FAQ Hatalar: - Karşılaştığınız hataları http://bugs.winehq.org adresinden Wine + Karşılaştığınız hataları https://bugs.winehq.org adresinden Wine Bugzilla ile bildirebilirsiniz. Lütfen bir hata bildirmeden önce hatanın önceden girilip girilmediğini öğrenmek için Bugzilla'da arama yapınız. @@ -157,11 +157,11 @@ IRC: irc.freenode.net sunucusundan #WineHQ kanalı ile çevrimiçi yardım alabilirsiniz. Git: Geçerli Wine geliştirme ağacına Git üzerinden erişim sağlanabilir. - Daha fazla bilgi için http://www.winehq.org/git adresine gidiniz. + Daha fazla bilgi için https://www.winehq.org/git adresine gidiniz. E-posta listeleri: Wine geliştiricileri için birtakım e-posta listeleri bulunmaktadır. - Daha fazla bilgi için http://www.winehq.org/forums adresine gidiniz. + Daha fazla bilgi için https://www.winehq.org/forums adresine gidiniz. Eğer bir şey eklemek veya hata düzeltmek istiyorsanız, lütfen sonraki sürümde yer alabilmesii için wine-devel(a)winehq.org e-posta listesine bir diff --git a/documentation/README.uk b/documentation/README.uk index f9a4fa4853..a70e4979f1 100644 --- a/documentation/README.uk +++ b/documentation/README.uk @@ -21,7 +21,7 @@ Wine Installer для компонування і встановлення Wine. Запустіть програму як "wine program". Додаткові джерела інформації перераховані в кінці цього файлу. Ознайомтеся з посібником з Wine, -а також з сайтом http://www.winehq.org. +а також з сайтом https://www.winehq.org. 3. ВИМОГИ @@ -46,7 +46,7 @@ Linux: FreeBSD: Wine не буде працювати як слід на версіях нижче, ніж FreeBSD 6.3 чи 7.0. Для FreeBSD 6.3 є патч, що дозволяє Wine запускатися. - Відвідайте http://wiki.freebsd.org/Wine для додаткової інформації. + Відвідайте https://wiki.freebsd.org/Wine для додаткової інформації. Solaris: Найкраще збирати Wine інструментами GNU (gcc, gas, тощо). Увага: @@ -79,13 +79,13 @@ Mac OS X: Додаткові бібліотеки підтримки: Конфігураційний скрипт виведе список додаткових бібліотек, які не були знайдені у вашій системі. Ознайомтеся з переліком потрібних пакетів за - адресою http://wiki.winehq.org/Recommended_Packages. + адресою https://wiki.winehq.org/Recommended_Packages. На 64-бітних платформах ви повинні переконатися, що у вас встановлені 32-бітні версії цих бібліотек; за більш детальною інформацією зверніться - до http://wiki.winehq.org/WineOn64bit. Якщо вам потрібен 64-бітний Wine + до https://wiki.winehq.org/WineOn64bit. Якщо вам потрібен 64-бітний Wine (чи змішаний 32-бітний та 64-бітний встановлювач Wine), дивіться - http://wiki.winehq.org/Wine64 за більш детальною інформацією. + https://wiki.winehq.org/Wine64 за більш детальною інформацією. 4. ЗБИРАННЯ @@ -113,7 +113,7 @@ make перед встановленням. Після встановлення запустіть конфігураційну програму "winecfg". Відвідайте Службу -підтримки на http://www.winehq.org/, якщо виникнуть питання щодо конфігурування. +підтримки на https://www.winehq.org/, якщо виникнуть питання щодо конфігурування. 6. ЗАПУСК ПРОГРАМ @@ -140,26 +140,26 @@ Wine знаходиться в процесі розробки, тому дея 7. ОТРИМАННЯ ДОДАТКОВОЇ ІНФОРМАЦІЇ WWW: Багато інформації про Wine є в WineHQ на - http://www.winehq.org/: різні керівництва Wine, база даних додатків, + https://www.winehq.org/: різні керівництва Wine, база даних додатків, база даних помилок. Ймовірно найкраще почати з цього сайту. -FAQ: Wine FAQ розташований на http://www.winehq.org/FAQ +FAQ: Wine FAQ розташований на https://www.winehq.org/FAQ -Wiki: Wine Wiki розташована на http://wiki.winehq.org +Wiki: Wine Wiki розташована на https://wiki.winehq.org Списки розсилання: Є кілька розсилок для користувачів і розробників Wine; - дивіться http://www.winehq.org/forums для додаткової інформації. + дивіться https://www.winehq.org/forums для додаткової інформації. Помилки(баги): - Повідомляйте про помилки у Wine Bugzilla на http://bugs.winehq.org + Повідомляйте про помилки у Wine Bugzilla на https://bugs.winehq.org Перш ніж відправляти повідомлення про помилку перевірте в базі, чи ця помилка вже виявлена. IRC: Онлайн допомога доступна на каналі #WineHQ на irc.freenode.net. Git: Поточне дерево розробки Wine доступне через Git. - Дивіться http://www.winehq.org/git за детальною інформацією. + Дивіться https://www.winehq.org/git за детальною інформацією. Якщо ви щось додали або виправили помилку, надішліть патч (найкраще використавши git-format-patch) на wine-devel(a)winehq.org для його diff --git a/documentation/README.zh_cn b/documentation/README.zh_cn index ce23c99b96..936172471b 100644 --- a/documentation/README.zh_cn +++ b/documentation/README.zh_cn @@ -21,7 +21,7 @@ Wine 是自由软件，在 GNU LGPL 协议下发布；请查看 LICENSE 文件运行程序时，请使用“wine [程序名]”的语法。如需了解更多信息或解决遇到的问题，您可以继续阅读本文件的剩余部分，或阅读 Wine 的手册页。 -需特别指出的是，您可以在网站：http://www.winehq.org 上找到十分丰富 +需特别指出的是，您可以在网站：https://www.winehq.org 上找到十分丰富的信息。 @@ -40,7 +40,7 @@ Wine 是自由软件，在 GNU LGPL 协议下发布；请查看 LICENSE 文件 FreeBSD 信息： Wine 通常不会在早于 FreeBSD 8.0 的系统上正常工作。 - 请查看 http://wiki.freebsd.org/Wine 以了解更多信息。 + 请查看 https://wiki.freebsd.org/Wine 以了解更多信息。 Solaris 信息：您大部分情况下可能需要使用 GNU 工具链（gcc、gas 等）来构建 Wine。 @@ -73,13 +73,13 @@ Mac OS X 信息: 可选的支持库：当可选的函数库无法在您的系统中找到时，configure 会显示对应的提示信息。 - 请查看 http://wiki.winehq.org/Recommended_Packages 以了解您应当安装的 + 请查看 https://wiki.winehq.org/Recommended_Packages 以了解您应当安装的软件包的信息。在 64 位平台上，如果以 32 位的方式编译 Wine（这是默认情况），您必须确保 - 对应函数库的 32 位版本已被安装；请查看 http://wiki.winehq.org/WineOn64bit + 对应函数库的 32 位版本已被安装；请查看 https://wiki.winehq.org/WineOn64bit 以了解详情。如果您想安装一个真正的 64 位 Wine（或者一个混合 32 位 Wine 和 - 64 位 Wine 的版本），请参阅 http://wiki.winehq.org/Wine64 以了解具体内容。 + 64 位 Wine 的版本），请参阅 https://wiki.winehq.org/Wine64 以了解具体内容。 4. 编译 @@ -103,7 +103,7 @@ make 不要忘记事先卸载先前任何安装过的、会引起冲突的 Wine 软件集。请在安装前尝试“dpkg -r wine”、“rpm -e wine”或“make uninstall”。 -一旦安装完成，您可以运行“winecfg”配置工具。请参考 http://www.winehq.org/ +一旦安装完成，您可以运行“winecfg”配置工具。请参考 https://www.winehq.org/ 网站中的支持页面以了解配置技巧。 @@ -129,26 +129,26 @@ Wine 不是十全十美的，所以某些程序可能会崩溃。如果这样的 7. 获取更多信息 -WWW: 有关 Wine 的很多信息可以在 WineHQ 网站：http://www.winehq.org/ +WWW: 有关 Wine 的很多信息可以在 WineHQ 网站：https://www.winehq.org/ 上面找到。包括：各类 Wine 相关的向导、应用程序数据库（AppDB）、漏洞跟踪系统等等。这个网站可能是您最佳的起始之处。 -FAQ: Wine 常见问题位于 http://www.winehq.org/FAQ +FAQ: Wine 常见问题位于 https://www.winehq.org/FAQ -维基： Wine 维基位于 http://wiki.winehq.org +维基： Wine 维基位于 https://wiki.winehq.org 邮件列表：存在数个服务于 Wine 用户和开发者的邮件列表； - 请查看 http://www.winehq.org/forums 以了解更多信息。 + 请查看 https://www.winehq.org/forums 以了解更多信息。 -Bugs: 请向位于 http://bugs.winehq.org 的 Wine Bugzilla 提交 bug。 +Bugs: 请向位于 https://bugs.winehq.org 的 Wine Bugzilla 提交 bug。请在提交漏洞报告前先在 bugzilla 数据库中进行搜索，检查先前是否已有类似的已知问题以避免重复，并跟踪这些问题的修复情况。 IRC: 您可以在 irc.freenode.net 的 #WineHQ 频道获取到在线帮助。 Git: 当前 Wine 的开发树可经由 Git 获取。 - 请前往 http://www.winehq.org/git 以了解更多信息。 + 请前往 https://www.winehq.org/git 以了解更多信息。如果您在代码中添加了某些内容，或是修复了某个 bug，请向 wine-devel(a)winehq.org 这个邮件列表发送对应的补丁（建议使用 -- 2.15.1

1 0

[PATCH] testbot/web: Remove some unused escapeHTML() import directives.
by Francois Gouget 07 Dec '17

07 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Feedback.pl | 1 - testbot/web/ForgotPassword.pl | 1 - testbot/web/ResetPassword.pl | 1 - 3 files changed, 3 deletions(-) diff --git a/testbot/web/Feedback.pl b/testbot/web/Feedback.pl index e22dc3af..ded705a1 100644 --- a/testbot/web/Feedback.pl +++ b/testbot/web/Feedback.pl @@ -21,7 +21,6 @@ use strict; package FeedbackPage; -use CGI qw(:standard escapeHTML); use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Config; diff --git a/testbot/web/ForgotPassword.pl b/testbot/web/ForgotPassword.pl index 801b50d7..c6240e7d 100644 --- a/testbot/web/ForgotPassword.pl +++ b/testbot/web/ForgotPassword.pl @@ -21,7 +21,6 @@ use strict; package ForgotPasswordPage; -use CGI qw(:standard escapeHTML); use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Users; diff --git a/testbot/web/ResetPassword.pl b/testbot/web/ResetPassword.pl index d512968d..431a4da0 100644 --- a/testbot/web/ResetPassword.pl +++ b/testbot/web/ResetPassword.pl @@ -21,7 +21,6 @@ use strict; package ResetPasswordPage; -use CGI qw(:standard escapeHTML); use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Users; -- 2.15.0

1 0

[PATCH] testbot/web: Add ids so one can link to a given job on the Home page.
by Francois Gouget 07 Dec '17

07 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/index.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/index.pl b/testbot/web/index.pl index 3f3a91e6..b0c2d450 100644 --- a/testbot/web/index.pl +++ b/testbot/web/index.pl @@ -87,7 +87,8 @@ sub GenerateDataCell($$$$) my $PropertyName = $PropertyDescriptor->GetName(); if ($PropertyName eq "Status") { - print "<td><a href='/JobDetails.pl?Key=", uri_escape($Item->GetKey()), "'>"; + my $EscapedKey = uri_escape($Item->GetKey()); + print "<td id='job$EscapedKey'><a href='/JobDetails.pl?Key=$EscapedKey'>"; my %HTMLChunks = ("queued" => "<span class='queued'>queued</span>", "running" => "<span class='running'>running</span>", -- 2.15.0

1 0

[PATCH] testbot/web: Use our escapeHTML() instead of calling directly the CGI one.
by Francois Gouget 07 Dec '17

07 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Login.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testbot/web/Login.pl b/testbot/web/Login.pl index 99757c54..f17d60ed 100644 --- a/testbot/web/Login.pl +++ b/testbot/web/Login.pl @@ -21,7 +21,6 @@ use strict; package LoginPage; -use CGI qw(:standard escapeHTML); use ObjectModel::BasicPropertyDescriptor; use ObjectModel::CGI::FreeFormPage; use WineTestBot::Config; @@ -79,7 +78,7 @@ sub GenerateFields($) if (defined($self->GetParam("Target"))) { print "<div><input type='hidden' name='Target' value='", - escapeHTML($self->GetParam("Target")), "'></div>\n"; + $self->escapeHTML($self->GetParam("Target")), "'></div>\n"; } $self->SUPER::GenerateFields(); -- 2.15.0

1 0

[PATCH] testbot: Remove extraneous colons in new() calls.
by Francois Gouget 07 Dec '17

07 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Branches.pm | 4 ++-- testbot/lib/WineTestBot/Roles.pm | 4 ++-- testbot/lib/WineTestBot/Users.pm | 4 ++-- testbot/lib/WineTestBot/VMs.pm | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/lib/WineTestBot/Branches.pm b/testbot/lib/WineTestBot/Branches.pm index 63a582c7..bfd24ddc 100644 --- a/testbot/lib/WineTestBot/Branches.pm +++ b/testbot/lib/WineTestBot/Branches.pm @@ -97,8 +97,8 @@ sub CreateItem($) sub CreateBranches(;$) { my ($ScopeObject) = @_; - return WineTestBot::Branches::->new("Branches", "Branches", "Branch", - \@PropertyDescriptors, $ScopeObject); + return WineTestBot::Branches->new("Branches", "Branches", "Branch", + \@PropertyDescriptors, $ScopeObject); } 1; diff --git a/testbot/lib/WineTestBot/Roles.pm b/testbot/lib/WineTestBot/Roles.pm index 86c5a13a..7c59e6a4 100644 --- a/testbot/lib/WineTestBot/Roles.pm +++ b/testbot/lib/WineTestBot/Roles.pm @@ -73,8 +73,8 @@ sub CreateItem($) sub CreateRoles(;$) { my ($ScopeObject) = @_; - return WineTestBot::Roles::->new("Roles", "Roles", "Role", - \@PropertyDescriptors, $ScopeObject); + return WineTestBot::Roles->new("Roles", "Roles", "Role", + \@PropertyDescriptors, $ScopeObject); } 1; diff --git a/testbot/lib/WineTestBot/Users.pm b/testbot/lib/WineTestBot/Users.pm index 9618a18d..2139b6d5 100644 --- a/testbot/lib/WineTestBot/Users.pm +++ b/testbot/lib/WineTestBot/Users.pm @@ -333,8 +333,8 @@ sub CreateItem($) sub CreateUsers(;$) { my ($ScopeObject) = @_; - return WineTestBot::Users::->new("Users", "Users", "User", - \@PropertyDescriptors, $ScopeObject); + return WineTestBot::Users->new("Users", "Users", "User", + \@PropertyDescriptors, $ScopeObject); } sub AuthenticateLDAP($$$) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index b9313429..c6272ee2 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -553,8 +553,8 @@ sub CreateItem($) sub CreateVMs(;$) { my ($ScopeObject) = @_; - return WineTestBot::VMs::->new("VMs", "VMs", "VM", - \@PropertyDescriptors, $ScopeObject); + return WineTestBot::VMs->new("VMs", "VMs", "VM", + \@PropertyDescriptors, $ScopeObject); } sub SortKeysBySortOrder($$) -- 2.15.0

1 0

[PATCH] testbot: Document a quirk of Collection::Add().
by Francois Gouget 07 Dec '17

07 Dec '17

Not only does it not force loading from the database, it marks the Collection as loaded. So if Add() is the first call on a Collection, calling GetKeys() or GetItems() later on will only return the new Item. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/ObjectModel/Collection.pm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 9d3d3aef..1b29ec16 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -168,6 +168,11 @@ sub Load($) Instantiates a new Item and adds it to the Collection. +Note that not only does calling Add() not force loading from the database, +it marks the Collection as loaded. So if Add() is the first call on a +Collection, calling GetKeys() or GetItems() later on will only return the new +Item. + See Item->new() for details on the Item's default column values and for important information regarding its primary key. -- 2.15.0

1 0

[Tools] testbot: Don't fail setting the Status of a brand new VM.
by Francois Gouget 07 Dec '17

07 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index c6272ee2..7db0aa51 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -221,7 +221,7 @@ sub Status($;$) my $CurrentStatus = $self->SUPER::Status; return $CurrentStatus if (!defined $NewStatus); - if ($NewStatus ne $CurrentStatus) + if (!defined $CurrentStatus or $NewStatus ne $CurrentStatus) { $self->SUPER::Status($NewStatus); $self->{OldStatus} = $CurrentStatus; -- 2.15.0

1 0

[Tools v3 1/2] testbot: Run make_makefiles when a file is added or removed.
by Zebediah Figura 07 Dec '17

07 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: also run 'git add -A' so that new files will actually be seen by make_makefiles. v3: also check if tools/make_makefiles itself was modified. testbot/bin/build/Build.pl | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 051039f..82cd66a 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -74,6 +74,7 @@ sub ApplyPatch($$$) { my ($PatchFile, $PatchType, $BaseName) = @_; + my $NeedMakeMakefiles = !1; my $NeedMakefile = 0; my $NeedMakeInclude = !1; my $NeedBuildDeps = !1; @@ -84,7 +85,7 @@ sub ApplyPatch($$$) { my $Line; while (defined($Line = <FH>) && - ($NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || + (! $NeedMakeMakefiles || $NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) { if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) @@ -111,13 +112,19 @@ sub ApplyPatch($$$) { $NeedConfigure = 1; } + elsif ($Line =~ m=^new file= || $Line =~ m=^deleted file= || $Line =~ m=^rename= || + $Line =~ m=diff.*tools/make_makefiles=) + { + $NeedMakeMakefiles = $NeedConfigure = 1; + } } close FH; } InfoMsg "Applying patch\n"; system("( cd $DataDir/wine && set -x && " . - " git apply --verbose $PatchFile " . + " git apply --verbose $PatchFile && " . + " git add -A " . ") >> $LogDir/Build.log 2>&1"); if ($? != 0) { @@ -125,6 +132,19 @@ sub ApplyPatch($$$) return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); } + if ($NeedMakeMakefiles) + { + InfoMsg "Running make_makefiles\n"; + system("( cd $DataDir/wine && set -x && " . + " ./tools/make_makefiles " . + ") >> $LogDir/Build.log 2>&1"); + if ($? != 0) + { + LogMsg "make_makefiles failed\n"; + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); + } + } + if ($NeedAutoconf && ! $NeedConfigure) { InfoMsg "Running autoconf\n"; -- 2.7.4

1 1

[PATCH] loader/wine.pl.UTF-8.man.in: Move WineHQ URL to https
by Austin English 06 Dec '17

06 Dec '17

Missed in 3bc68c24b972643aba2b96dcdcf97ea2f9fb82bd Signed-off-by: Austin English <austinenglish(a)gmail.com> --- loader/wine.pl.UTF-8.man.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.pl.UTF-8.man.in b/loader/wine.pl.UTF-8.man.in index 9f1f2cf28d..c487d0a6d8 100644 --- a/loader/wine.pl.UTF-8.man.in +++ b/loader/wine.pl.UTF-8.man.in @@ -305,7 +305,7 @@ można pobrać ze strony Najaktualnieszy zrzut kodu można pobrać przez GIT. Aby dowiedzieć się jak to zrobić, odwiedź stronę .I -http://www.winehq.org/git +https://www.winehq.org/git .PP WineHQ, siedziba rozwoju .B wine -- 2.13.6

1 0

[PATCH v4 3/3] ntdll: Don't require full-page reads in NtReadFileScatter
by Andrew Eikum 06 Dec '17

06 Dec '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 30 +++++++++++++++++++++++++++++- dlls/ntdll/file.c | 5 ++--- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 94feee6372..410c3f0591 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,7 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID wbuf = NULL, rbuf1, rbuf2; + char *wbuf = NULL, *rbuf1, *rbuf2; BOOL br; evt = CreateEventW( NULL, TRUE, FALSE, NULL ); @@ -4492,6 +4492,34 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, "data should not have been read into buffer\n" ); + ResetEvent( evt ); + + /* partial page read */ + memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize / 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize / 2, "got unexpected bytes transferred: %u\n", tx ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + memset( rbuf2, 0, si.dwPageSize ); + ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3d4a94923b..570e46c0a7 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1041,7 +1041,6 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", file, event, apc, apc_user, io_status, segments, length, offset, key); - if (length % page_size) return STATUS_INVALID_PARAMETER; if (!io_status) return STATUS_ACCESS_VIOLATION; status = server_get_unix_fd( file, FILE_READ_DATA, &unix_handle, @@ -1060,9 +1059,9 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap { if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) result = pread( unix_handle, (char *)segments->Buffer + pos, - page_size - pos, offset->QuadPart + total ); + min( length - pos, page_size - pos ), offset->QuadPart + total ); else - result = read( unix_handle, (char *)segments->Buffer + pos, page_size - pos ); + result = read( unix_handle, (char *)segments->Buffer + pos, min( length - pos, page_size - pos ) ); if (result == -1) { -- 2.15.1

1 0

[PATCH v4 2/3] ntdll: Don't return an error when reading past EOF in NtReadFileScatter
by Andrew Eikum 06 Dec '17

06 Dec '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 34 +++++++++++++++++++++++++++++++++- dlls/ntdll/file.c | 8 +++----- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 4980e02d7d..94feee6372 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,7 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID wbuf = NULL, rbuf1; + LPVOID wbuf = NULL, rbuf1, rbuf2; BOOL br; evt = CreateEventW( NULL, TRUE, FALSE, NULL ); @@ -4380,6 +4380,9 @@ static void test_WriteFileGather(void) rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + rbuf2 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf2 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + memset( &ovl, 0, sizeof(ovl) ); ovl.hEvent = evt; memset( fse, 0, sizeof(fse) ); @@ -4461,6 +4464,34 @@ static void test_WriteFileGather(void) ResetEvent( evt ); + /* read past EOF */ + memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + fse[1].Buffer = rbuf2; + memset( rbuf1, 0, si.dwPageSize ); + memset( rbuf2, 0x17, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize * 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize, "got unexpected bytes transferred: %u\n", tx ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + memset( rbuf1, 0x17, si.dwPageSize ); + ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, + "data should not have been read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); @@ -4481,6 +4512,7 @@ static void test_WriteFileGather(void) VirtualFree( wbuf, 0, MEM_RELEASE ); VirtualFree( rbuf1, 0, MEM_RELEASE ); + VirtualFree( rbuf2, 0, MEM_RELEASE ); CloseHandle( evt ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 9df15ffe1d..3d4a94923b 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1070,11 +1070,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap status = FILE_GetNtStatus(); break; } - if (!result) - { - status = STATUS_END_OF_FILE; - break; - } + if (!result) break; total += result; length -= result; if ((pos += result) == page_size) @@ -1084,6 +1080,8 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap } } + if (total == 0) status = STATUS_END_OF_FILE; + send_completion = cvalue != 0; if (needs_close) close( unix_handle ); -- 2.15.1

1 0

[PATCH v4 1/3] ntdll: Report NtReadFileScatter results asynchronously
by Andrew Eikum 06 Dec '17

06 Dec '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v4: Return STATUS_PENDING only when we get far enough to actually try to read the file. Also added tests to all patches for GetOverlappedResults with an event. dlls/kernel32/tests/file.c | 104 ++++++++++++++++++++++++++++++++++++++++----- dlls/ntdll/file.c | 29 ++++++------- 2 files changed, 108 insertions(+), 25 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0b8cef23f8..4980e02d7d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4347,13 +4347,16 @@ static void test_SetFileValidData(void) static void test_WriteFileGather(void) { char temp_path[MAX_PATH], filename[MAX_PATH]; - HANDLE hfile, hiocp1, hiocp2; - DWORD ret, size; + HANDLE hfile, hiocp1, hiocp2, evt; + DWORD ret, size, tx; ULONG_PTR key; FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID buf = NULL; + LPVOID wbuf = NULL, rbuf1; + BOOL br; + + evt = CreateEventW( NULL, TRUE, FALSE, NULL ); ret = GetTempPathA( MAX_PATH, temp_path ); ok( ret != 0, "GetTempPathA error %d\n", GetLastError() ); @@ -4371,12 +4374,18 @@ static void test_WriteFileGather(void) ok( hiocp2 != 0, "CreateIoCompletionPort failed err %u\n", GetLastError() ); GetSystemInfo( &si ); - buf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); - ok( buf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + wbuf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( wbuf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + + rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; + fse[0].Buffer = wbuf; + memset( wbuf, 0x42, si.dwPageSize ); + SetLastError( 0xdeadbeef ); if (!WriteFileGather( hfile, fse, si.dwPageSize, NULL, &ovl )) ok( GetLastError() == ERROR_IO_PENDING, "WriteFileGather failed err %u\n", GetLastError() ); @@ -4384,20 +4393,95 @@ static void test_WriteFileGather(void) ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize, "got unexpected bytes transferred: %u\n", tx ); + + ResetEvent( evt ); + + /* read exact size */ memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; - if (!ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl )) - ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + tx = 0; + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == TRUE, "GetOverlappedResult failed: %u\n", GetLastError() ); + ok( tx == si.dwPageSize, "got unexpected bytes transferred: %u\n", tx ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + + ResetEvent( evt ); + + /* start read at EOF */ + memset( &ovl, 0, sizeof(ovl) ); + ovl.hEvent = evt; + S(U(ovl)).OffsetHigh = 0; + S(U(ovl)).Offset = si.dwPageSize; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should have failed\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF || + GetLastError() == ERROR_IO_PENDING, "ReadFileScatter gave wrong error %u\n", GetLastError() ); + if (GetLastError() == ERROR_IO_PENDING) + { + SetLastError( 0xdeadbeef ); + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( !ret, "GetQueuedCompletionStatus should have returned failure\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF, "Got wrong error: %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + SetLastError( 0xdeadbeef ); + br = GetOverlappedResult( hfile, &ovl, &tx, TRUE ); + ok( br == FALSE, "GetOverlappedResult should have failed\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF, "Got wrong error: %u\n", GetLastError() ); + } + else + { + SetLastError( 0xdeadbeef ); + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 100 ); + ok( !ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( GetLastError() == WAIT_TIMEOUT, "GetQueuedCompletionStatus gave wrong error %u\n", GetLastError() ); + ok( povl == NULL, "wrong ovl %p\n", povl ); + } + + ResetEvent( evt ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); - VirtualFree( buf, 0, MEM_RELEASE ); + + /* file handle must be overlapped */ + hfile = CreateFileA( filename, GENERIC_READ, 0, 0, OPEN_EXISTING, + FILE_FLAG_NO_BUFFERING | FILE_ATTRIBUTE_NORMAL, 0 ); + ok( hfile != INVALID_HANDLE_VALUE, "CreateFile failed err %u\n", GetLastError() ); + + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + SetLastError( 0xdeadbeef ); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should fail\n" ); + ok( GetLastError() == ERROR_INVALID_PARAMETER, "ReadFileScatter failed err %u\n", GetLastError() ); + + VirtualFree( wbuf, 0, MEM_RELEASE ); + VirtualFree( rbuf1, 0, MEM_RELEASE ); + CloseHandle( evt ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ca2afa0e89..9df15ffe1d 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1086,25 +1086,24 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap send_completion = cvalue != 0; - error: if (needs_close) close( unix_handle ); - if (status == STATUS_SUCCESS) - { - io_status->u.Status = status; - io_status->Information = total; - TRACE("= SUCCESS (%u)\n", total); - if (event) NtSetEvent( event, NULL ); - if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, - (ULONG_PTR)apc_user, (ULONG_PTR)io_status, 0 ); - } - else - { - TRACE("= 0x%08x\n", status); - if (status != STATUS_PENDING && event) NtResetEvent( event, NULL ); - } + io_status->u.Status = status; + io_status->Information = total; + TRACE("= 0x%08x (%u)\n", status, total); + if (event) NtSetEvent( event, NULL ); + if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, + (ULONG_PTR)apc_user, (ULONG_PTR)io_status, 0 ); if (send_completion) NTDLL_AddCompletion( file, cvalue, status, total ); + return STATUS_PENDING; + +error: + if (needs_close) close( unix_handle ); + + TRACE("= 0x%08x\n", status); + if (event) NtResetEvent( event, NULL ); + return status; } -- 2.15.1

1 0

[PATCH] MAINTAINERS: Move WineHQ URLs to https
by Austin English 06 Dec '17

06 Dec '17

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- MAINTAINERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 2f92151d78..6845a7abb8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3,7 +3,7 @@ List of Wine subsection maintainers When submitting patches to Wine, the guidelines at -<http://wiki.winehq.org/SubmittingPatches> should be followed. This file +<https://wiki.winehq.org/SubmittingPatches> should be followed. This file contains a list of maintainers for subsections of Wine. When submitting patches, you may want to CC relevant people from this list. If you have questions about your work in an area of Wine, you may find a list of @@ -317,7 +317,7 @@ F: */ Stable Branch M: Michael Stefaniuc <mstefani(a)winehq.org> -W: http://wiki.winehq.org/StableRules +W: https://wiki.winehq.org/StableRules Staging Branch M: Sebastian Lackner <sebastian(a)fds-team.de> -- 2.13.6

1 0

[PATCH] msvcp: Disable relay for _Thrd_current function
by Piotr Caban 06 Dec '17

06 Dec '17

Spotted by Stefan. The patch workarounds a crash when relay is enabled in x86_64 and arm case. Another way of fixing it is to define separate spec file entries for different platforms (make_specfiles will also need to be changed in that case). Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp110/msvcp110.spec | 2 +- dlls/msvcp120/msvcp120.spec | 2 +- dlls/msvcp120_app/msvcp120_app.spec | 2 +- dlls/msvcp140/msvcp140.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)

1 0

[PATCH] mshtml.idl: Added IDOMKeyboardEvent declaration.
by Jacek Caban 06 Dec '17

06 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 16 +++++++++++++ include/mshtml.idl | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+)

1 0

[PATCH] msvcp: Fix failure class layout and exception information data
by Piotr Caban 06 Dec '17

06 Dec '17

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/cxx.h | 46 ++++++++++++++------ dlls/msvcp90/exception.c | 107 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 130 insertions(+), 23 deletions(-)

1 0

[PATCH 01/10] wined3d: Add support for WINED3DFMT_BC4_SNORM format.
by Józef Kucia 06 Dec '17

06 Dec '17

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/utils.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index f73968546fbf..cd0a8e15c908 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -268,6 +268,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_BC3_UNORM_SRGB, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC3_UNORM, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC4_UNORM, WINED3DFMT_BC4_TYPELESS, ""}, + {WINED3DFMT_BC4_SNORM, WINED3DFMT_BC4_TYPELESS, ""}, {WINED3DFMT_BC5_UNORM, WINED3DFMT_BC5_TYPELESS, ""}, {WINED3DFMT_BC5_SNORM, WINED3DFMT_BC5_TYPELESS, ""}, {WINED3DFMT_BC6H_UF16, WINED3DFMT_BC6H_TYPELESS, ""}, @@ -361,6 +362,7 @@ static const struct wined3d_format_block_info format_block_info[] = {WINED3DFMT_BC2_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC4_UNORM, 4, 4, 8, TRUE}, + {WINED3DFMT_BC4_SNORM, 4, 4, 8, TRUE}, {WINED3DFMT_BC5_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC5_SNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC6H_UF16, 4, 4, 16, TRUE}, @@ -1179,6 +1181,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, ARB_TEXTURE_COMPRESSION_RGTC, NULL}, + {WINED3DFMT_BC4_SNORM, GL_COMPRESSED_SIGNED_RED_RGTC1, GL_COMPRESSED_SIGNED_RED_RGTC1, 0, + GL_RED, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, + ARB_TEXTURE_COMPRESSION_RGTC, NULL}, {WINED3DFMT_BC5_UNORM, GL_COMPRESSED_RG_RGTC2, GL_COMPRESSED_RG_RGTC2, 0, GL_RG, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -3434,6 +3441,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC4_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = get_format_idx(WINED3DFMT_BC4_SNORM); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC5_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = get_format_idx(WINED3DFMT_BC5_SNORM); -- 2.13.6

4 22

[PATCH] wined3d: Add Intel HD Graphics 5000 to the GPU list.
by Li Keqing 06 Dec '17

06 Dec '17

Signed-off-by: Li Keqing <auroracloud4096(a)gmail.com> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e0bf986044..183a37f79e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1487,6 +1487,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWD, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_HD5000, "Intel(R) HD Graphics 5000", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_I5100_1, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_I5100_2, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, {HW_VENDOR_INTEL, CARD_INTEL_I5100_3, "Intel(R) Iris(TM) Graphics 5100", DRIVER_INTEL_HD4000, 1536}, @@ -2155,6 +2156,7 @@ cards_intel[] = /* Haswell */ {"Iris Pro 5200", CARD_INTEL_IP5200_1}, {"Iris 5100", CARD_INTEL_I5100_1}, + {"HD Graphics 5000", CARD_INTEL_HD5000}, /* MacOS */ {"Haswell Mobile", CARD_INTEL_HWM}, {"Iris OpenGL Engine", CARD_INTEL_HWM}, /* MacOS */ /* Ivybridge */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da06ba159f..4c43ad8b6c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2435,6 +2435,7 @@ enum wined3d_pci_device CARD_INTEL_IVBS = 0x015a, CARD_INTEL_HWD = 0x0412, CARD_INTEL_HWM = 0x0416, + CARD_INTEL_HD5000 = 0x0a26, CARD_INTEL_I5100_1 = 0x0a22, CARD_INTEL_I5100_2 = 0x0a2a, CARD_INTEL_I5100_3 = 0x0a2b, -- 2.14.3 (Apple Git-98)

2 1

[PATCH 1/2] msvcp: Use int64 for byval _Thrd_t parameters.
by Stefan Dösinger 06 Dec '17

06 Dec '17

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> --- dlls/msvcp110/msvcp110.spec | 8 ++++---- dlls/msvcp120/msvcp120.spec | 8 ++++---- dlls/msvcp120_app/msvcp120_app.spec | 8 ++++---- dlls/msvcp140/msvcp140.spec | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 7cf350e0c0..001b9add3e 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -3858,11 +3858,11 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() -@ cdecl _Thrd_detach(ptr) -@ cdecl _Thrd_equal(ptr ptr) +@ cdecl _Thrd_detach(int64) +@ cdecl _Thrd_equal(int64 int64) @ stub _Thrd_exit -@ cdecl _Thrd_join(ptr long) -@ cdecl _Thrd_lt(ptr ptr) +@ cdecl _Thrd_join(int64 long) +@ cdecl _Thrd_lt(int64 int64) @ cdecl _Thrd_sleep(ptr) @ cdecl _Thrd_start(ptr ptr ptr) @ cdecl _Thrd_yield() diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 5285adafb8..729657c24e 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -3805,11 +3805,11 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) @ cdecl _Thrd_current() -@ cdecl _Thrd_detach(ptr) -@ cdecl _Thrd_equal(ptr ptr) +@ cdecl _Thrd_detach(int64) +@ cdecl _Thrd_equal(int64 int64) @ stub _Thrd_exit -@ cdecl _Thrd_join(ptr long) -@ cdecl _Thrd_lt(ptr ptr) +@ cdecl _Thrd_join(int64 long) +@ cdecl _Thrd_lt(int64 int64) @ cdecl _Thrd_sleep(ptr) @ cdecl _Thrd_start(ptr ptr ptr) @ cdecl _Thrd_yield() diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index f33a2ec78e..62668d21f1 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -3805,11 +3805,11 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) msvcp120._Thrd_create @ cdecl _Thrd_current() msvcp120._Thrd_current -@ cdecl _Thrd_detach(ptr) msvcp120._Thrd_detach -@ cdecl _Thrd_equal(ptr ptr) msvcp120._Thrd_equal +@ cdecl _Thrd_detach(int64) msvcp120._Thrd_detach +@ cdecl _Thrd_equal(int64 int64) msvcp120._Thrd_equal @ stub _Thrd_exit -@ cdecl _Thrd_join(ptr long) msvcp120._Thrd_join -@ cdecl _Thrd_lt(ptr ptr) msvcp120._Thrd_lt +@ cdecl _Thrd_join(int64 long) msvcp120._Thrd_join +@ cdecl _Thrd_lt(int64 int64) msvcp120._Thrd_lt @ cdecl _Thrd_sleep(ptr) msvcp120._Thrd_sleep @ cdecl _Thrd_start(ptr ptr ptr) msvcp120._Thrd_start @ cdecl _Thrd_yield() msvcp120._Thrd_yield diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index 1f61afb550..5d5518115b 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3722,12 +3722,12 @@ @ stub _Thrd_abort @ cdecl _Thrd_create(ptr ptr ptr) _Thrd_create @ cdecl _Thrd_current() _Thrd_current -@ cdecl _Thrd_detach(ptr) _Thrd_detach -@ cdecl _Thrd_equal(ptr ptr) _Thrd_equal +@ cdecl _Thrd_detach(int64) _Thrd_detach +@ cdecl _Thrd_equal(int64 int64) _Thrd_equal @ stub _Thrd_exit @ cdecl _Thrd_hardware_concurrency() _Thrd_hardware_concurrency @ cdecl _Thrd_id() _Thrd_id -@ cdecl _Thrd_join(ptr long) _Thrd_join +@ cdecl _Thrd_join(int64 long) _Thrd_join @ cdecl _Thrd_sleep(ptr) _Thrd_sleep @ cdecl _Thrd_start(ptr ptr ptr) _Thrd_start @ cdecl _Thrd_yield() _Thrd_yield -- 2.13.6

2 3

[PATCH] winegstreamer: Remove redundant check
by Alistair Leslie-Hughes 06 Dec '17

06 Dec '17

ret is already checked above and never assigned again. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winegstreamer/gstdemux.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3ef2324..95a1630 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1158,10 +1158,7 @@ static HRESULT GST_Connect(GSTInPin *pPin, IPin *pConnectPin, ALLOCATOR_PROPERTI WaitForSingleObject(This->event, -1); gst_element_get_state(This->container, NULL, NULL, -1); - if (ret < 0) { - WARN("Ret: %i\n", ret); - hr = E_FAIL; - } else if (!This->cStreams) { + if (!This->cStreams) { FIXME("GStreamer could not find any streams\n"); hr = E_FAIL; } else { -- 1.9.1

2 1

[PATCH] [d3dx9]: Add D3DXComputeTangentFrame implementation
by Vijay Kiran Kamuju 06 Dec '17

06 Dec '17

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 13 +++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 21 files changed, 33 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_24/d3dx9_24.spec b/dlls/d3dx9_24/d3dx9_24.spec index 0ca8777efe..98aafabf10 100644 --- a/dlls/d3dx9_24/d3dx9_24.spec +++ b/dlls/d3dx9_24/d3dx9_24.spec @@ -21,7 +21,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_25/d3dx9_25.spec b/dlls/d3dx9_25/d3dx9_25.spec index a5449810a4..dc3b7c9780 100644 --- a/dlls/d3dx9_25/d3dx9_25.spec +++ b/dlls/d3dx9_25/d3dx9_25.spec @@ -21,7 +21,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_26/d3dx9_26.spec b/dlls/d3dx9_26/d3dx9_26.spec index 9e1200442f..d37ee77b3c 100644 --- a/dlls/d3dx9_26/d3dx9_26.spec +++ b/dlls/d3dx9_26/d3dx9_26.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_27/d3dx9_27.spec b/dlls/d3dx9_27/d3dx9_27.spec index 9e1200442f..d37ee77b3c 100644 --- a/dlls/d3dx9_27/d3dx9_27.spec +++ b/dlls/d3dx9_27/d3dx9_27.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_28/d3dx9_28.spec b/dlls/d3dx9_28/d3dx9_28.spec index b316a23baf..ee0192e6c7 100644 --- a/dlls/d3dx9_28/d3dx9_28.spec +++ b/dlls/d3dx9_28/d3dx9_28.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_29/d3dx9_29.spec b/dlls/d3dx9_29/d3dx9_29.spec index b316a23baf..ee0192e6c7 100644 --- a/dlls/d3dx9_29/d3dx9_29.spec +++ b/dlls/d3dx9_29/d3dx9_29.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_30/d3dx9_30.spec b/dlls/d3dx9_30/d3dx9_30.spec index e00fa54786..cf08ae1fb3 100644 --- a/dlls/d3dx9_30/d3dx9_30.spec +++ b/dlls/d3dx9_30/d3dx9_30.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_31/d3dx9_31.spec b/dlls/d3dx9_31/d3dx9_31.spec index d308939ef6..6db192eab2 100644 --- a/dlls/d3dx9_31/d3dx9_31.spec +++ b/dlls/d3dx9_31/d3dx9_31.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_32/d3dx9_32.spec b/dlls/d3dx9_32/d3dx9_32.spec index c2292dff39..ea9b99db31 100644 --- a/dlls/d3dx9_32/d3dx9_32.spec +++ b/dlls/d3dx9_32/d3dx9_32.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_33/d3dx9_33.spec b/dlls/d3dx9_33/d3dx9_33.spec index c2292dff39..ea9b99db31 100644 --- a/dlls/d3dx9_33/d3dx9_33.spec +++ b/dlls/d3dx9_33/d3dx9_33.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_34/d3dx9_34.spec b/dlls/d3dx9_34/d3dx9_34.spec index c2292dff39..ea9b99db31 100644 --- a/dlls/d3dx9_34/d3dx9_34.spec +++ b/dlls/d3dx9_34/d3dx9_34.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_35/d3dx9_35.spec b/dlls/d3dx9_35/d3dx9_35.spec index c2292dff39..ea9b99db31 100644 --- a/dlls/d3dx9_35/d3dx9_35.spec +++ b/dlls/d3dx9_35/d3dx9_35.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 0fdf4e135e..1bad3e77ec 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 6294ce624f..09a928fcb6 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -7507,6 +7507,19 @@ done: return hr; } +/************************************************************************* + * D3DXComputeTangentFrame (D3DX9_36.@) + */ +HRESULT WINAPI D3DXComputeTangentFrame(ID3DXMesh *mesh, DWORD options) +{ + TRACE("mesh %p, options %#x\n", mesh, options); + + return D3DXComputeTangentFrameEx(mesh, D3DDECLUSAGE_TEXCOORD, 0, + D3DDECLUSAGE_BINORMAL, 0, D3DDECLUSAGE_TANGENT, 0, D3DDECLUSAGE_NORMAL, 0, + options | D3DXTANGENT_GENERATE_IN_PLACE, + NULL, 0.01f, 0.25f, 0.01f, NULL, NULL); +} + /************************************************************************* * D3DXComputeNormals (D3DX9_36.@) */ diff --git a/dlls/d3dx9_37/d3dx9_37.spec b/dlls/d3dx9_37/d3dx9_37.spec index 0fdf4e135e..1bad3e77ec 100644 --- a/dlls/d3dx9_37/d3dx9_37.spec +++ b/dlls/d3dx9_37/d3dx9_37.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_38/d3dx9_38.spec b/dlls/d3dx9_38/d3dx9_38.spec index 0fdf4e135e..1bad3e77ec 100644 --- a/dlls/d3dx9_38/d3dx9_38.spec +++ b/dlls/d3dx9_38/d3dx9_38.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_39/d3dx9_39.spec b/dlls/d3dx9_39/d3dx9_39.spec index 0fdf4e135e..1bad3e77ec 100644 --- a/dlls/d3dx9_39/d3dx9_39.spec +++ b/dlls/d3dx9_39/d3dx9_39.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_40/d3dx9_40.spec b/dlls/d3dx9_40/d3dx9_40.spec index 0fdf4e135e..1bad3e77ec 100644 --- a/dlls/d3dx9_40/d3dx9_40.spec +++ b/dlls/d3dx9_40/d3dx9_40.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_41/d3dx9_41.spec b/dlls/d3dx9_41/d3dx9_41.spec index 0fdf4e135e..1bad3e77ec 100644 --- a/dlls/d3dx9_41/d3dx9_41.spec +++ b/dlls/d3dx9_41/d3dx9_41.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_42/d3dx9_42.spec b/dlls/d3dx9_42/d3dx9_42.spec index 2f2ac5fd61..8c5ab4e18a 100644 --- a/dlls/d3dx9_42/d3dx9_42.spec +++ b/dlls/d3dx9_42/d3dx9_42.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) diff --git a/dlls/d3dx9_43/d3dx9_43.spec b/dlls/d3dx9_43/d3dx9_43.spec index 2f2ac5fd61..8c5ab4e18a 100644 --- a/dlls/d3dx9_43/d3dx9_43.spec +++ b/dlls/d3dx9_43/d3dx9_43.spec @@ -25,7 +25,7 @@ @ stub D3DXComputeNormalMap(ptr ptr ptr long long float) @ stdcall D3DXComputeNormals(ptr ptr) @ stub D3DXComputeTangent(ptr long long long long ptr) -@ stub D3DXComputeTangentFrame(ptr long) +@ stdcall D3DXComputeTangentFrame(ptr long) @ stdcall D3DXComputeTangentFrameEx(ptr long long long long long long long long long ptr float float float ptr ptr) @ stub D3DXConcatenateMeshes(ptr long long ptr ptr ptr ptr ptr) @ stdcall D3DXConvertMeshSubsetToSingleStrip(ptr long long ptr ptr) -- 2.15.1

2 3

[PATCH] user32/tests: Remove runtime check for EndMenu()
by Nikolay Sivov 06 Dec '17

06 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- It's already used directly in msg.c. dlls/user32/tests/edit.c | 12 +++--------- dlls/user32/tests/menu.c | 9 ++------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 9372c484af..79c0010e4e 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -38,14 +38,12 @@ struct edit_notify { static struct edit_notify notifications; -static BOOL (WINAPI *pEndMenu) (void); static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static void init_function_pointers(void) { HMODULE hdll = GetModuleHandleA("user32"); - pEndMenu = (void*)GetProcAddress(hdll, "EndMenu"); pGetMenuBarInfo = (void*)GetProcAddress(hdll, "GetMenuBarInfo"); } @@ -2294,7 +2292,7 @@ static LRESULT CALLBACK edit4_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPAR if (hWnd != (HWND)lParam) { got_wm_capturechanged = TRUE; - pEndMenu(); + EndMenu(); } break; } @@ -2337,7 +2335,7 @@ static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPAR ok(!mbi.fFocused, "mbi.fFocused = TRUE\n"); } - pEndMenu(); + EndMenu(); break; } } @@ -2985,11 +2983,7 @@ START_TEST(edit) test_child_edit_wmkeydown(); test_fontsize(); test_dialogmode(); - if (pEndMenu) - test_contextmenu(); - else - win_skip("EndMenu is not available\n"); - + test_contextmenu(); test_EM_GETHANDLE(); test_paste(); diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 03454fedfd..f99cd946b4 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -41,7 +41,6 @@ static BOOL (WINAPI *pGetMenuInfo)(HMENU,LPCMENUINFO); static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static UINT (WINAPI *pSendInput)(UINT, INPUT*, size_t); static BOOL (WINAPI *pSetMenuInfo)(HMENU,LPCMENUINFO); -static BOOL (WINAPI *pEndMenu) (void); static void init_function_pointers(void) { @@ -56,7 +55,6 @@ static void init_function_pointers(void) GET_PROC(GetMenuBarInfo) GET_PROC(SendInput) GET_PROC(SetMenuInfo) - GET_PROC(EndMenu) #undef GET_PROC } @@ -3518,7 +3516,7 @@ static LRESULT WINAPI menu_cancelmode_wnd_proc(HWND hwnd, UINT msg, PostMessageA( hwnd, WM_MOUSEMOVE, 0, 0); return SendMessageA( g_hwndtosend, WM_CANCELMODE, 0, 0); } - pEndMenu(); + EndMenu(); return TRUE; } } @@ -3531,10 +3529,7 @@ static void test_menu_cancelmode(void) HWND hwnd, hwndchild; HMENU menu, menubar; MSG msg; - if( !pEndMenu) { /* win95 */ - win_skip( "EndMenu is not available\n"); - return; - } + hwnd = CreateWindowExA( 0, (LPCSTR)MAKEINTATOM(atomMenuCheckClass), NULL, WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200, NULL, NULL, NULL, NULL); -- 2.15.0

1 0

[PATCH 1/7] wined3d: Implement SV_ClipDistance.
by Józef Kucia 05 Dec '17

05 Dec '17

In D3D10+ all clip distances declared in a shader are always enabled. In other words, enablement of clip distances is a property of a shader. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- >From wined3d API standpoint, the RS_CLIPPLANEENABLE state is ignored when SM4+ shaders are active. We shouldn't touch the RS_CLIPPLANEENABLE state when SM4+ shaders are in use. Fixes https://bugs.winehq.org/show_bug.cgi?id=43932 --- dlls/wined3d/glsl_shader.c | 63 ++++++++++++++++++++++++++++++++++-------- dlls/wined3d/shader.c | 36 +++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 43 ++++++++++++++-------------- 3 files changed, 109 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5d08c00175eb..b89b7aa3d53c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -241,7 +241,10 @@ struct glsl_shader_prog_link struct glsl_cs_program cs; GLuint id; DWORD constant_update_mask; - UINT constant_version; + unsigned int constant_version; + DWORD shader_controlled_clip_distances : 1; + DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ + DWORD padding : 23; }; struct glsl_program_key @@ -6923,6 +6926,26 @@ static void shader_glsl_setup_sm4_shader_output(struct shader_glsl_priv *priv, } } +static void shader_glsl_generate_clip_or_cull_distances(struct wined3d_string_buffer *buffer, + const struct wined3d_shader_signature_element *element, DWORD clip_or_cull_distance_mask) +{ + unsigned int i, clip_or_cull_index; + char reg_mask[6]; + + /* Assign consecutive indices starting from 0. */ + clip_or_cull_index = element->semantic_idx ? wined3d_popcount(clip_or_cull_distance_mask & 0xf) : 0; + for (i = 0; i < 4; ++i) + { + if (!(element->mask & (WINED3DSP_WRITEMASK_0 << i))) + continue; + + shader_glsl_write_mask_to_str(WINED3DSP_WRITEMASK_0 << i, reg_mask); + shader_addline(buffer, "gl_ClipDistance[%u] = outputs[%u]%s;\n", + clip_or_cull_index, element->register_idx, reg_mask); + ++clip_or_cull_index; + } +} + static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv, const struct wined3d_gl_info *gl_info, const DWORD *map, const struct wined3d_shader_signature *input_signature, @@ -6932,7 +6955,7 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv { struct wined3d_string_buffer *buffer = &priv->shader_buffer; const char *semantic_name; - UINT semantic_idx; + unsigned int semantic_idx; char reg_mask[6]; unsigned int i; @@ -6966,6 +6989,10 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv shader_addline(buffer, "gl_Layer = floatBitsToInt(outputs[%u])%s;\n", output->register_idx, reg_mask); } + else if (output->sysval_semantic == WINED3D_SV_CLIP_DISTANCE) + { + shader_glsl_generate_clip_or_cull_distances(buffer, output, reg_maps_out->clip_distance_mask); + } else if (output->sysval_semantic) { FIXME("Unhandled sysval semantic %#x.\n", output->sysval_semantic); @@ -9852,6 +9879,7 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, entry->ps.id = 0; entry->cs.id = shader_id; entry->constant_version = 0; + entry->shader_controlled_clip_distances = 0; entry->ps.np2_fixup_info = NULL; add_glsl_program_entry(priv, entry); @@ -9926,11 +9954,12 @@ static void set_glsl_compute_shader_program(const struct wined3d_context *contex static void set_glsl_shader_program(const struct wined3d_context *context, const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_shader *pre_rasterization_shader; const struct ps_np2fixup_info *np2fixup_info = NULL; - struct glsl_shader_prog_link *entry = NULL; struct wined3d_shader *hshader, *dshader, *gshader; + struct glsl_shader_prog_link *entry = NULL; struct wined3d_shader *vshader = NULL; struct wined3d_shader *pshader = NULL; GLuint reorder_shader_id = 0; @@ -10068,6 +10097,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const entry->ps.id = ps_id; entry->cs.id = 0; entry->constant_version = 0; + entry->shader_controlled_clip_distances = 0; entry->ps.np2_fixup_info = np2fixup_info; /* Add the hash table entry */ add_glsl_program_entry(priv, entry); @@ -10194,7 +10224,15 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const shader_glsl_init_gs_uniform_locations(gl_info, priv, program_id, &entry->gs); shader_glsl_init_ps_uniform_locations(gl_info, priv, program_id, &entry->ps, pshader ? pshader->limits->constant_float : 0); - checkGLcall("Find glsl program uniform locations"); + checkGLcall("find glsl program uniform locations"); + + pre_rasterization_shader = gshader ? gshader : dshader ? dshader : vshader; + if (pre_rasterization_shader && pre_rasterization_shader->reg_maps.shader_version.major >= 4) + { + unsigned int clip_distance_count = wined3d_popcount(pre_rasterization_shader->reg_maps.clip_distance_mask); + entry->shader_controlled_clip_distances = 1; + entry->clip_distance_mask = (1u << clip_distance_count) - 1; + } if (needs_legacy_glsl_syntax(gl_info)) { @@ -10350,6 +10388,7 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex struct glsl_context_data *ctx_data = context->shader_backend_data; const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_priv *priv = shader_priv; + struct glsl_shader_prog_link *glsl_program; GLenum current_vertex_color_clamp; GLuint program_id, prev_id; @@ -10357,13 +10396,15 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex priv->fragment_pipe->enable_extension(gl_info, !use_ps(state)); prev_id = ctx_data->glsl_program ? ctx_data->glsl_program->id : 0; - set_glsl_shader_program(context, state, priv, ctx_data); + glsl_program = ctx_data->glsl_program; - if (ctx_data->glsl_program) + if (glsl_program) { - program_id = ctx_data->glsl_program->id; - current_vertex_color_clamp = ctx_data->glsl_program->vs.vertex_color_clamp; + program_id = glsl_program->id; + current_vertex_color_clamp = glsl_program->vs.vertex_color_clamp; + if (glsl_program->shader_controlled_clip_distances) + context_enable_clip_distances(context, glsl_program->clip_distance_mask); } else { @@ -10392,8 +10433,8 @@ static void shader_glsl_select(void *shader_priv, struct wined3d_context *contex GL_EXTCALL(glUseProgram(program_id)); checkGLcall("glUseProgram"); - if (program_id) - context->constant_update_mask |= ctx_data->glsl_program->constant_update_mask; + if (glsl_program) + context->constant_update_mask |= glsl_program->constant_update_mask; } context->shader_update_mask |= (1u << WINED3D_SHADER_TYPE_COMPUTE); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index c4eed76d78f0..7d59f8b9a042 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -952,6 +952,31 @@ static HRESULT shader_record_shader_phase(struct wined3d_shader *shader, return WINED3D_OK; } +static HRESULT shader_calculate_clip_or_cull_distance_mask( + const struct wined3d_shader_signature_element *e, DWORD *mask) +{ + unsigned int i; + + *mask = 0; + + /* Cull and clip distances are packed in 4 component registers. 0 and 1 are + * the only allowed semantic indices. + */ + if (e->semantic_idx >= MAX_CLIP_DISTANCES / 4) + { + WARN("Invalid clip/cull distance index %u.\n", e->semantic_idx); + return WINED3DERR_INVALIDCALL; + } + + for (i = 0; i < 4; ++i) + { + if (e->mask & (WINED3DSP_WRITEMASK_0 << i)) + *mask |= 1u << (4 * e->semantic_idx + i); + } + + return WINED3D_OK; +} + static void wined3d_insert_interpolation_mode(DWORD *packed_interpolation_mode, unsigned int register_idx, enum wined3d_shader_interpolation_mode mode) { @@ -1754,7 +1779,16 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st { for (i = 0; i < output_signature->element_count; ++i) { - reg_maps->output_registers |= 1u << output_signature->elements[i].register_idx; + const struct wined3d_shader_signature_element *e = &output_signature->elements[i]; + DWORD mask; + + reg_maps->output_registers |= 1u << e->register_idx; + if (e->sysval_semantic == WINED3D_SV_CLIP_DISTANCE) + { + if (FAILED(hr = shader_calculate_clip_or_cull_distance_mask(e, &mask))) + return hr; + reg_maps->clip_distance_mask |= mask; + } } } else if (reg_maps->output_registers) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index da06ba159f79..b8f0b4d194e0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1006,31 +1006,32 @@ struct wined3d_shader_reg_maps BYTE bumpmat; /* MAX_TEXTURES, 8 */ BYTE luminanceparams; /* MAX_TEXTURES, 8 */ struct wined3d_shader_resource_info uav_resource_info[MAX_UNORDERED_ACCESS_VIEWS]; - DWORD uav_read_mask; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ - DWORD uav_counter_mask; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ - - WORD usesnrm : 1; - WORD vpos : 1; - WORD usesdsx : 1; - WORD usesdsy : 1; - WORD usestexldd : 1; - WORD usesmova : 1; - WORD usesfacing : 1; - WORD usesrelconstF : 1; - WORD fog : 1; - WORD usestexldl : 1; - WORD usesifc : 1; - WORD usescall : 1; - WORD usespow : 1; - WORD point_size : 1; - WORD vocp : 1; - WORD padding : 1; + DWORD uav_read_mask : 8; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ + DWORD uav_counter_mask : 8; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ + + DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ + DWORD usesnrm : 1; + DWORD vpos : 1; + DWORD usesdsx : 1; + DWORD usesdsy : 1; + DWORD usestexldd : 1; + DWORD usesmova : 1; + DWORD usesfacing : 1; + DWORD usesrelconstF : 1; + DWORD fog : 1; + DWORD usestexldl : 1; + DWORD usesifc : 1; + DWORD usescall : 1; + DWORD usespow : 1; + DWORD point_size : 1; + DWORD vocp : 1; + DWORD padding : 25; DWORD rt_mask; /* Used render targets, 32 max. */ /* Whether or not loops are used in this shader, and nesting depth */ - unsigned loop_depth; - UINT min_rel_offset, max_rel_offset; + unsigned int loop_depth; + unsigned int min_rel_offset, max_rel_offset; struct wined3d_shader_tgsm *tgsm; SIZE_T tgsm_capacity; -- 2.13.6

5 16

[PATCH v3 1/3] ntdll: Report NtReadFileScatter results asynchronously
by Andrew Eikum 05 Dec '17

05 Dec '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v3: Always SetLastError before checking GLE return. dlls/kernel32/tests/file.c | 58 +++++++++++++++++++++++++++++++++++++++------- dlls/ntdll/file.c | 2 +- 2 files changed, 51 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0b8cef23f8..a8d229c887 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,8 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID buf = NULL; + LPVOID wbuf = NULL, rbuf1; + BOOL br; ret = GetTempPathA( MAX_PATH, temp_path ); ok( ret != 0, "GetTempPathA error %d\n", GetLastError() ); @@ -4371,12 +4372,17 @@ static void test_WriteFileGather(void) ok( hiocp2 != 0, "CreateIoCompletionPort failed err %u\n", GetLastError() ); GetSystemInfo( &si ); - buf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); - ok( buf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + wbuf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( wbuf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + + rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; + memset( wbuf, 0x42, si.dwPageSize ); + fse[0].Buffer = wbuf; + SetLastError(0xdeadbeef); if (!WriteFileGather( hfile, fse, si.dwPageSize, NULL, &ovl )) ok( GetLastError() == ERROR_IO_PENDING, "WriteFileGather failed err %u\n", GetLastError() ); @@ -4384,20 +4390,56 @@ static void test_WriteFileGather(void) ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + /* read exact size */ memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; - if (!ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl )) - ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + SetLastError(0xdeadbeef); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + + /* start read at EOF */ + memset( &ovl, 0, sizeof(ovl) ); + S(U(ovl)).OffsetHigh = 0; + S(U(ovl)).Offset = si.dwPageSize; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + SetLastError(0xdeadbeef); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should have failed\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF || + GetLastError() == ERROR_IO_PENDING, "ReadFileScatter gave wrong error %u\n", GetLastError() ); + if (GetLastError() == ERROR_IO_PENDING) + { + SetLastError(0xdeadbeef); + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( !ret, "GetQueuedCompletionStatus should have returned failure\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF, "Got wrong error: %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + } + else + { + SetLastError(0xdeadbeef); + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 100 ); + ok( !ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( GetLastError() == WAIT_TIMEOUT, "GetQueuedCompletionStatus gave wrong error %u\n", GetLastError() ); + ok( povl == NULL, "wrong ovl %p\n", povl ); + } + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); - VirtualFree( buf, 0, MEM_RELEASE ); + VirtualFree( wbuf, 0, MEM_RELEASE ); + VirtualFree( rbuf1, 0, MEM_RELEASE ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ca2afa0e89..12b1d0f6c5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1105,7 +1105,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap if (send_completion) NTDLL_AddCompletion( file, cvalue, status, total ); - return status; + return STATUS_PENDING; } -- 2.15.1

2 2

[PATCH 4/4] d2d1: Introduce a registry key to limit the maximum supported factory version.
by Henri Verbeet 05 Dec '17

05 Dec '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/Makefile.in | 2 +- dlls/d2d1/d2d1_private.h | 6 ++++ dlls/d2d1/factory.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 82 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/Makefile.in b/dlls/d2d1/Makefile.in index 51b9627..20d3f26 100644 --- a/dlls/d2d1/Makefile.in +++ b/dlls/d2d1/Makefile.in @@ -1,6 +1,6 @@ MODULE = d2d1.dll IMPORTLIB = d2d1 -IMPORTS = d3d10_1 dxguid uuid gdi32 user32 +IMPORTS = d3d10_1 dxguid uuid gdi32 user32 advapi32 DELAYIMPORTS = dwrite C_SRCS = \ diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 3b21bc1..f876cbf 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -52,6 +52,12 @@ enum d2d_shape_type D2D_SHAPE_TYPE_COUNT, }; +struct d2d_settings +{ + unsigned int max_version_factory; +}; +extern struct d2d_settings d2d_settings DECLSPEC_HIDDEN; + struct d2d_clip_stack { D2D1_RECT_F *stack; diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index da2b892..f202332 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -22,8 +22,14 @@ #define D2D1_INIT_GUID #include "d2d1_private.h" +WINE_DECLARE_DEBUG_CHANNEL(winediag); WINE_DEFAULT_DEBUG_CHANNEL(d2d); +struct d2d_settings d2d_settings = +{ + ~0u, /* No ID2D1Factory version limit by default. */ +}; + struct d2d_factory { ID2D1Factory1 ID2D1Factory1_iface; @@ -62,7 +68,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory1 *iface { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_ID2D1Factory1) + if ((IsEqualGUID(iid, &IID_ID2D1Factory1) && d2d_settings.max_version_factory >= 1) || IsEqualGUID(iid, &IID_ID2D1Factory) || IsEqualGUID(iid, &IID_IUnknown)) { @@ -537,3 +543,71 @@ void WINAPI D2D1MakeRotateMatrix(float angle, D2D1_POINT_2F center, D2D1_MATRIX_ matrix->_31 = center.x - center.x * cos_theta + center.y * sin_theta; matrix->_32 = center.y - center.x * sin_theta - center.y * cos_theta; } + +static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) +{ + DWORD type, data, size; + + size = sizeof(data); + if (application_key && !RegQueryValueExA(application_key, + name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) + goto success; + + size = sizeof(data); + if (default_key && !RegQueryValueExA(default_key, + name, 0, &type, (BYTE *)&data, &size) && type == REG_DWORD) + goto success; + + return FALSE; + +success: + *value = data; + return TRUE; +} + +static void d2d_settings_init(void) +{ + HKEY default_key, tmp_key, application_key = NULL; + char buffer[MAX_PATH + 10]; + DWORD len; + + if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\Direct2D", &default_key)) + default_key = NULL; + + len = GetModuleFileNameA(0, buffer, MAX_PATH); + if (len && len < MAX_PATH) + { + char *p, *appname = buffer; + + if ((p = strrchr(appname, '/'))) + appname = p + 1; + if ((p = strrchr(appname, '\\'))) + appname = p + 1; + strcat(appname, "\\Direct2D"); + + if (!RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\AppDefaults", &tmp_key)) + { + if (RegOpenKeyA(tmp_key, appname, &application_key)) + application_key = NULL; + RegCloseKey(tmp_key); + } + } + + if (!default_key && !application_key) + return; + + if (get_config_key_dword(default_key, application_key, "max_version_factory", &d2d_settings.max_version_factory)) + ERR_(winediag)("Limiting maximum Direct2D factory version to %#x.\n", d2d_settings.max_version_factory); + + if (application_key) + RegCloseKey(application_key); + if (default_key) + RegCloseKey(default_key); +} + +BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) +{ + if (reason == DLL_PROCESS_ATTACH) + d2d_settings_init(); + return TRUE; +} -- 2.1.4

3 6

[PATCH] readme: Use UTF-8 consistently in all translations.
by Lauri Kenttä 05 Dec '17

05 Dec '17

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- documentation/README.hu | 274 ++++++++++++++++++++++----------------------- documentation/README.ko | 242 +++++++++++++++++++-------------------- documentation/README.pt | 210 +++++++++++++++++----------------- documentation/README.pt_br | 166 +++++++++++++-------------- 4 files changed, 446 insertions(+), 446 deletions(-) diff --git a/documentation/README.hu b/documentation/README.hu index d3fee99401..ca99d9b325 100644 --- a/documentation/README.hu +++ b/documentation/README.hu @@ -1,207 +1,207 @@ -1. BEVEZET�S +1. BEVEZETÉS -A Wine egy program amivel lehet�s�g ny�lik a Microsoft Windows -programok futtat�s�ra (bele�rtve a DOS, Windows 3.x �s Win32 -futtathat� �llom�nyokat) Unix alatt. Tartalmaz egy program bet�lt�t, -ami bet�lt �s futtat egy Microsoft Windows bin�rist, �s egy -f�ggv�nyk�nyvt�rat (nev�n Winelib), ami implement�lja a Windows -API h�v�sokat azok Unix, vagy X11 megfelel�inek haszn�lat�val. -Ez a f�ggv�nyk�nyvt�r haszn�lhat� a Win32 k�d nat�v Unix futtathat� -�llom�nny� portl�s�hoz. +A Wine egy program amivel lehetõség nyílik a Microsoft Windows +programok futtatására (beleértve a DOS, Windows 3.x és Win32 +futtatható állományokat) Unix alatt. Tartalmaz egy program betöltõt, +ami betölt és futtat egy Microsoft Windows binárist, és egy +függvénykönyvtárat (nevén Winelib), ami implementálja a Windows +API hívásokat azok Unix, vagy X11 megfelelõinek használatával. +Ez a függvénykönyvtár használható a Win32 kód natív Unix futtatható +állománnyá portlásához. -A Wine egy szabad szoftver, a GNU LGPL alatt kiadva; n�zze meg a -LICENSE f�jlt a r�szletek�rt. +A Wine egy szabad szoftver, a GNU LGPL alatt kiadva; nézze meg a +LICENSE fájlt a részletekért. -2. GYORS IND�T�S +2. GYORS INDÍTÁS -Ha �n forr�sb�l ford�totta, aj�nlott a Wine telep�t� haszn�lata a -a Wine leford�t�s�hoz �s telep�t�s�hez. A Wine forr�sk�d sz�l�- -k�nyvt�r�b�l (ami tartalmazza ezt a f�jlt), futtassa: +Ha ön forrásból fordította, ajánlott a Wine telepítõ használata a +a Wine lefordításához és telepítéséhez. A Wine forráskód szülõ- +könyvtárából (ami tartalmazza ezt a fájlt), futtassa: ./tools/wineinstall -A programok futtat�sa "wine [opci�k] program". A tov�bbi inform�ci�khoz -�s a probl�ma felvil�gos�t�shoz olvassa el ennek a f�jlnak a tov�bbi r�sz�t, -a Wine man oldal�t, �s k�l�n�sen gazdag inform�ci� tal�lhat� itt: +A programok futtatása "wine [opciók] program". A további információkhoz +és a probléma felvilágosításhoz olvassa el ennek a fájlnak a további részét, +a Wine man oldalát, és különösen gazdag információ található itt: http://www.winehq.org. -3. K�VETELM�NYEK +3. KÖVETELMÉNYEK -A Wine-nak a ford�t�s�hoz �s futtat�s�hoz �nnek sz�ks�ge lesz a k�vetkez�kb�l +A Wine-nak a fordításához és futtatásához önnek szüksége lesz a következõkbõl egynek: - Linux 2.0.36-os, vagy feletti verzi� - FreeBSD 5.3, vagy k�s�bbi - Solaris x86 2.5, vagy k�s�bbi + Linux 2.0.36-os, vagy feletti verzió + FreeBSD 5.3, vagy késõbbi + Solaris x86 2.5, vagy késõbbi NetBSD-current -Mivel a Wine-nak k�ks�ges kernelszint� fut�si sz�l t�mogat�s a futtat�shoz, csak -a fent eml�tett oper�ci�s rendszerek t�mogatottak. -M�s oper�ci�s rendszerek, amik t�mogatj�k a kernel fut�si sz�lakat, t�mogatva -lesznek a j�v�ben. - -Linux inform�ci�: - Amig a Linux 2.2.x m�k�dik, �s a Linux 2.0.x is m�k�dni fog - (a r�gebbi 2.0.x verzi�kban fut�si sz�l miatti �sszeoml�sok voltak), - az a legjobb, ha �nnek a legfrisebb kernele van, mint p�ld�ul a 2.4.x. - -FreeBSD inform�ci�: - Wine-nak le kell fordulnia a FreeBSD 4.x �s FreeBSD 5.x verzi�kon, de a - FreeBSD 5.3 el�tti verzi�kon �ltal�ban nem fog m�k�dni. - - T�bb inform�ci� tal�lhat� a FreeBSD ports f�ban itt: +Mivel a Wine-nak kükséges kernelszintû futási szál támogatás a futtatáshoz, csak +a fent említett operációs rendszerek támogatottak. +Más operációs rendszerek, amik támogatják a kernel futási szálakat, támogatva +lesznek a jövõben. + +Linux információ: + Amig a Linux 2.2.x mûködik, és a Linux 2.0.x is mûködni fog + (a régebbi 2.0.x verziókban futási szál miatti összeomlások voltak), + az a legjobb, ha önnek a legfrisebb kernele van, mint például a 2.4.x. + +FreeBSD információ: + Wine-nak le kell fordulnia a FreeBSD 4.x és FreeBSD 5.x verziókon, de a + FreeBSD 5.3 elõtti verziókon általában nem fog mûködni. + + Több információ található a FreeBSD ports fában itt: <ftp://ftp.freebsd.org/pub/FreeBSD/ports/ports/emulators/wine/>. -Solaris inform�ci�: - A Wine ford�t�s�hoz kell a GNU toolchain (gcc, gas, etc.). - Figyelem : A gas telep�t�se *nemt* biztos�t�k, hogy a gcc fogja is - haszn�lni. A gcc �jraford�t�sa a gas telep�t�se ut�n, vagy a cc - szimbolikus linkel�se, �s ld-z�se a gnu tools-hoz sz�ks�ges. +Solaris információ: + A Wine fordításához kell a GNU toolchain (gcc, gas, etc.). + Figyelem : A gas telepítése *nemt* biztosíték, hogy a gcc fogja is + használni. A gcc újrafordítása a gas telepítése után, vagy a cc + szimbolikus linkelése, és ld-zése a gnu tools-hoz szükséges. -NetBSD inform�ci�: - ellen�rizze, hogy a USER_LDT, SYSVSHM, SYSVSEM, �s SYSVMSG opci�k be vannak-e +NetBSD információ: + ellenõrizze, hogy a USER_LDT, SYSVSHM, SYSVSEM, és SYSVMSG opciók be vannak-e kapcsolva a kernelben. -T�mogatott f�jlrendszerek: - A Wine fut a legt�bb f�jlrendszeren. Hab�r a Wine nem fog elindulni, ha - umsdos-t haszn�lunk a /tmp k�nyvt�rban. N�h�ny kompatibilit�si gondot - is bejelentettek a Samb�n kereszt�l el�rt f�jlok eset�ben. Az NTFS-t - lehet haszn�lni biztons�gban �r�sv�dett hozz�f�r�ssel, de az NTFS ellen - sz�l, hogy a Windows programoknak majdnem mindenhova �r�si jog kell. - NTFS f�jlok eset�n m�soljuk �t �ket egy �rhat� helyre. +Támogatott fájlrendszerek: + A Wine fut a legtöbb fájlrendszeren. Habár a Wine nem fog elindulni, ha + umsdos-t használunk a /tmp könyvtárban. Néhány kompatibilitási gondot + is bejelentettek a Sambán keresztül elért fájlok esetében. Az NTFS-t + lehet használni biztonságban írásvédett hozzáféréssel, de az NTFS ellen + szól, hogy a Windows programoknak majdnem mindenhova írási jog kell. + NTFS fájlok esetén másoljuk át õket egy írható helyre. -Alap k�vetelm�nyek: - �nnek fel kell telep�tenie az X11 fejleszt�i f�jlokat - (xlib6g-dev n�ven van a Debianban �s XFree86-devel n�ven a Red Hat-ben). +Alap követelmények: + Önnek fel kell telepítenie az X11 fejlesztõi fájlokat + (xlib6g-dev néven van a Debianban és XFree86-devel néven a Red Hat-ben). -Ford�t�si eszk�z k�vetelm�nyek: - x86 rendszereken gcc >= 2.7.2 sz�ks�ges. - A 2.7.2.3-n�l r�gebbi verzi�kban probl�m�k lehetnek k�l�nf�le f�jlokkal, - amik optimaliz�ci�val lettek ford�tva, gyakran a fejl�c f�jlok kezel�s�nek - probl�m�i miatt. A pgcc jelenelg nem m�k�dik s Wine-sl. A probl�ma oka +Fordítási eszköz követelmények: + x86 rendszereken gcc >= 2.7.2 szükséges. + A 2.7.2.3-nál régebbi verziókban problémák lehetnek különféle fájlokkal, + amik optimalizációval lettek fordítva, gyakran a fejléc fájlok kezelésének + problémái miatt. A pgcc jelenelg nem mûködik s Wine-sl. A probléma oka ismeretlen. - Term�szetesen kell a "make" is (legink�bb a GNU make). + Természetesen kell a "make" is (leginkább a GNU make). - Kell m�g a flex 2.5 verzi�, vagy k�s�bbi, �s a bison. + Kell még a flex 2.5 verzió, vagy késõbbi, és a bison. -Opci�n�lis t�mogat�si f�ggv�nyk�nyvt�rak: - Ha szeretne CUPS nyomtat� t�mogat�st, telep�tse fel a cups �s a cups-devel +Opciónális támogatási függvénykönyvtárak: + Ha szeretne CUPS nyomtató támogatást, telepítse fel a cups és a cups-devel csomagot. - Telep�tse fel a libxml2 csomagot, ha szeretn� hogy m�k�dj�n az msxml - implement�ci�. + Telepítse fel a libxml2 csomagot, ha szeretné hogy mûködjön az msxml + implementáció. -4. FORD�T�S +4. FORDÍTÁS -Ha �n nem haszn�lja a wineinstall-t, futtassa a k�vetkez� parancsokat s -Wine ford�t�s�hoz: +Ha ön nem használja a wineinstall-t, futtassa a következõ parancsokat s +Wine fordításához: ./configure make depend make -Ez le fogja ford�tani a "wine" programot �s sz�mos f�ggv�nyk�nyvt�rat/bin�rist. -A "wine" program be fogja t�lteni �s futtatni fogja a Windows futtathat� -�llom�nyokat. -A "libwine" f�ggv�nyk�nyvt�r ("Winelib") haszn�lhat� a Windows forr�sk�d Unix -alatt t�rt�n� ford�t�s�hoz �s linkel�s�hez. +Ez le fogja fordítani a "wine" programot és számos függvénykönyvtárat/binárist. +A "wine" program be fogja tölteni és futtatni fogja a Windows futtatható +állományokat. +A "libwine" függvénykönyvtár ("Winelib") használható a Windows forráskód Unix +alatt történõ fordításához és linkeléséhez. -A ford�t�si konfigur�ci�s opci�k megtekin�t�s�hez n�zze haszn�lja a ./configure --help +A fordítási konfigurációs opciók megtekinétéséhez nézze használja a ./configure --help parancsot. -�j kiad�sra friss�t�skor patch f�jl haszn�lat�val el�sz�r v�ltos a kiad�s legfels� -k�nyvt�rszintj�re (ahol a README f�jl megtal�lhat�). -Azut�n haszn�lja a "make clean" parancsot, �s foltozza meg a kiad�st ezzel: +Új kiadásra frissítéskor patch fájl használatával elõször váltos a kiadás legfelsõ +könyvtárszintjére (ahol a README fájl megtalálható). +Azután használja a "make clean" parancsot, és foltozza meg a kiadást ezzel: - gunzip -c patch-f�jl | patch -p1 + gunzip -c patch-fájl | patch -p1 -ahol a "patch-f�jl" a jav�t�folt f�jl f�jlneve (valami ilyesmi: -Wine-yymmdd.diff.gz). �jrafuttathatja a "./configure", �s azut�n +ahol a "patch-fájl" a javítófolt fájl fájlneve (valami ilyesmi: +Wine-yymmdd.diff.gz). Újrafuttathatja a "./configure", és azután a "make depend && make" parancsokat. -5. TELEP�T�S +5. TELEPÍTÉS -Ha a Wine egyszer helyesen lefordult, haszn�lhatja a "make install" -parancsot; ez telep�teni fogja a wine futtathat� f�jlt, a Wine man -oldal�t, �s n�h�ny egy�b sz�ks�ges f�jlt. +Ha a Wine egyszer helyesen lefordult, használhatja a "make install" +parancsot; ez telepíteni fogja a wine futtatható fájlt, a Wine man +oldalát, és néhány egyéb szükséges fájlt. -El�sz�r ne felejtse elt�vol�tani b�rmely el�z� Wine telep�t�st. -Pr�b�lja ki a "dpkg -r wine", �s az "rpm -e wine", vagy a "make uninstall" -parancsot telep�t�s el�tt. +Elõször ne felejtse eltávolítani bármely elõzõ Wine telepítést. +Próbálja ki a "dpkg -r wine", és az "rpm -e wine", vagy a "make uninstall" +parancsot telepítés elõtt. -L�togassa meg a t�mogat�si oldalt itt: http://www.winehq.org/ a konfigur�ci�s +Látogassa meg a támogatási oldalt itt: http://www.winehq.org/ a konfigurációs tippekhez. -F�ggv�nyk�nyvt�r bet�lt�si hib�k eset�n -(pl. "Error while loading shared libraries: libntdll.so"), ellen�rizze az -f�ggv�nyk�nyvt�r �tvonalt, hogy benne van-e az /etc/ld.so.conf �s futtassa az -ldconfig-ot root-k�nt. +Függvénykönyvtár betöltési hibák esetén +(pl. "Error while loading shared libraries: libntdll.so"), ellenõrizze az +függvénykönyvtár útvonalt, hogy benne van-e az /etc/ld.so.conf és futtassa az +ldconfig-ot root-ként. -6. PROGRAMOK FUTTAT�SA +6. PROGRAMOK FUTTATÁSA -Ha seg�ts�g�l h�vja a Wine-t, megadhatja a teljes �tvonal�t a futtathat� -�llom�nynak, vagy csak a f�jlnevet. +Ha segítségül hívja a Wine-t, megadhatja a teljes útvonalát a futtatható +állománynak, vagy csak a fájlnevet. -P�ld�ul: a Paszi�nsz ind�t�sa: +Például: a Pasziánsz indítása: - wine sol (a konfigf�jlban megadott keres�si �tvonal - wine sol.exe haszn�lat�val keress�k meg a f�jlt) + wine sol (a konfigfájlban megadott keresési útvonal + wine sol.exe használatával keressük meg a fájlt) - wine c:\\windows\\sol.exe (a DOS f�jln�v szintaxis haszn�lat�val) + wine c:\\windows\\sol.exe (a DOS fájlnév szintaxis használatával) - wine /usr/windows/sol.exe (a Unix-os f�jln�v szintaxis haszn�lat�val) + wine /usr/windows/sol.exe (a Unix-os fájlnév szintaxis használatával) - wine sol.exe /param�ter1 -param�ter2 param�ter3 - (program h�v�sa param�terekkel) + wine sol.exe /paraméter1 -paraméter2 paraméter3 + (program hívása paraméterekkel) -Felh�v�s: a f�jl el�s�i �tja is hozz� lesz adva a path-hez, ha a teljes n�v +Felhívás: a fájl eléséi útja is hozzá lesz adva a path-hez, ha a teljes név meg lett adva a parancssorban. -A Wine m�g nem teljes, �gy n�h�ny program �sszeomlik. Ha helyesen be�ll�tja a -winedbg-ot a documentation/debugger.sgml-nek megfelel�en, �n be lesz l�ptetve -egy hibakeres�be, ahol ut�naj�rhat, �s kijav�thatja a probl�m�t. -A tov�bbi infom�ci�hoz, hogy hogy kell ezt megcsin�lni, k�rem olvassa el a -documentation/debugging.sgml f�jlt. - -Jobb ha biztons�gba helyezi a fontos f�jlokat, miel�tt hozz�f�r�st a Wine-nak, -vagy haszn�ljon egy speci�lis Wine m�solatot bel�l�k, mert n�h�ny esetben a -felhaszn�l�k f�jls�r�l�st jeleztek. NE futtassa az Explorer-t, p�ld�ul, -ha �nnek nincs helyes biztons�gi ment�se, mert n�ha �tnevez/t�nkretesz -n�h�ny k�nyvt�rat. Nem csak m�s MS alkalmaz�s mint p�ld�ul a Messenger bizton�sgos, -de valahogy az Explorer futtat�sa is. Ez a bizonyos s�r�l�s (!$!$!$!$.pfr) -r�szlegesen jav�that� ennek a haszn�lat�val: +A Wine még nem teljes, így néhány program összeomlik. Ha helyesen beállítja a +winedbg-ot a documentation/debugger.sgml-nek megfelelõen, ön be lesz léptetve +egy hibakeresõbe, ahol utánajárhat, és kijavíthatja a problémát. +A további infomációhoz, hogy hogy kell ezt megcsinálni, kérem olvassa el a +documentation/debugging.sgml fájlt. + +Jobb ha biztonságba helyezi a fontos fájlokat, mielõtt hozzáférést a Wine-nak, +vagy használjon egy speciális Wine másolatot belõlük, mert néhány esetben a +felhasználók fájlsérülést jeleztek. NE futtassa az Explorer-t, például, +ha önnek nincs helyes biztonsági mentése, mert néha átnevez/tönkretesz +néhány könyvtárat. Nem csak más MS alkalmazás mint példéul a Messenger biztonásgos, +de valahogy az Explorer futtatása is. Ez a bizonyos sérülés (!$!$!$!$.pfr) +részlegesen javítható ennek a használatával: http://home.nexgo.de/andi.mohr/download/decorrupt_explorer -7. T�BB INFORM�CI� BESZERZ�SE +7. TÖBB INFORMÁCIÓ BESZERZÉSE -WWW: A Wine-r�l hatalmas mennyis�g� inform�ci� �rhet� el a WineHQ-n ezen - a c�men: http://www.winehq.org/ : k�l�nb�z� Wine �tmutat�k, - alkalmaz�s adatb�zis, �s hibak�vet�s. - Ez tal�n a legjobb kiindul�si pont. +WWW: A Wine-ról hatalmas mennyiségû információ érhetõ el a WineHQ-n ezen + a címen: http://www.winehq.org/ : különbözõ Wine útmutatók, + alkalmazás adatbázis, és hibakövetés. + Ez talán a legjobb kiindulási pont. -GYIK: A Wine GYIK itt tal�lhat�: http://www.winehq.org/FAQ +GYIK: A Wine GYIK itt található: http://www.winehq.org/FAQ -Usenet: T�rsaloghat a Wine-hoz kapcsol�d� t�m�kban, �s seg�ts�get k�rhet itt: +Usenet: Társaloghat a Wine-hoz kapcsolódó témákban, és segítséget kérhet itt: comp.emulators.ms-windows.wine. -Hib�k: Wine hibabejelent�s a Bugzilla-n kereszt�l itt: http://bugs.winehq.org - K�rem hibabejelent�s k�ld�se el�tt ellen�rizze, hogy az �n probl�m�ja - m�r megtal�lhat�-e az adatb�zisban. K�ldhet hibabejelent�seket a - comp.emulators.ms-windows.wine c�mre is. +Hibák: Wine hibabejelentés a Bugzilla-n keresztül itt: http://bugs.winehq.org + Kérem hibabejelentés küldése elõtt ellenõrizze, hogy az ön problémája + már megtalálható-e az adatbázisban. Küldhet hibabejelentéseket a + comp.emulators.ms-windows.wine címre is. -IRC: Azonnali seg�ts�g el�rhet� a #WineHQ csatorn�n a irc.freenode.net-en. +IRC: Azonnali segítség elérhetõ a #WineHQ csatornán a irc.freenode.net-en. -Git: A jelenlegi Wine fejleszt�i fa el�rhet� Git-en kereszt�l. - L�togasson el ide a tov�bbi inform�ci�hoz: http://www.winehq.org/git +Git: A jelenlegi Wine fejlesztõi fa elérhetõ Git-en keresztül. + Látogasson el ide a további információhoz: http://www.winehq.org/git -Levelez�list�k: - El�rhet� n�h�ny levelez�lista a Wine fejleszt�k sz�m�ra; n�zze meg a - http://www.winehq.org/forums c�met a tov�bbi inform�ci�hoz. +Levelezõlisták: + Elérhetõ néhány levelezõlista a Wine fejlesztõk számára; nézze meg a + http://www.winehq.org/forums címet a további információhoz. -Ha valamit hozz�ad, vagy hib�t jav�t, k�rem k�ldj�n jav�t�foltot ('diff -u' -form�tumban) a wine-devel(a)winehq.org levelez�lista c�mre, hogy beletehess�k a -k�vetkez� kiad�sba. +Ha valamit hozzáad, vagy hibát javít, kérem küldjön javítófoltot ('diff -u' +formátumban) a wine-devel(a)winehq.org levelezõlista címre, hogy beletehessük a +következõ kiadásba. -- Alexandre Julliard diff --git a/documentation/README.ko b/documentation/README.ko index 4686ad8eee..a0fdcb045e 100644 --- a/documentation/README.ko +++ b/documentation/README.ko @@ -1,191 +1,191 @@ -1. �Ұ� +1. 소개 -Wine�� Microsoft Windows ��α׷�(DOS, Windows 3.x, Win32 �� -��)�� н� �󿡼� �� ְ� �� ִ� ��α׷��Դϴ�. Wine�� -Microsoft Windows ��̳ʸ�� ε��ϰ� ��ϴ� ��α׷� �δ�� -Unix�� X11 API�� Ἥ Windows API�� ̺귯��(Winelib)�� -�̷�� ֽ��ϴ�. �� ̺귯�� Win32 �ڵ带 ��н� �� Ϸ� -�̽��ϴ� �뵵�ε� �� ֽ��ϴ�. +Wine은 Microsoft Windows 프로그램(DOS, Windows 3.x, Win32 실행 파일 +포함)을 유닉스 상에서 실행할 수 있게 해 주는 프로그램입니다. Wine은 +Microsoft Windows 바이너리를 로드하고 실행하는 프로그램 로더와 +Unix와 X11 API를 써서 Windows API를 구현한 라이브러리(Winelib)로 +이루어져 있습니다. 이 라이브러리는 Win32 코드를 유닉스 실행 파일로 +이식하는 용도로도 사용할 수 있습니다. -Wine�� Ʈ��̸� GNU LGPL �Ͽ� ��˴ϴ�. �ڼ�� -LICENSE �� Ͻʽÿ�. +Wine은 자유 소프트웨어이며 GNU LGPL 하에 배포됩니다. 자세한 내용은 +LICENSE 파일을 참조하십시오. -2. �� ġ �� +2. 간편 설치 및 실행 -�ҽ�� ޾� ��ϴ� �� Wine Installer�� ̿��ϴ� �� ϴ�. - Wine �ҽ�� ֻ�� 丮�� մϴ�: +소스를 받아 컴파일하는 경우 Wine Installer를 이용하는 것이 좋습니다. + Wine 소스의 최상위 디렉토리에서 다음 명령을 실행합니다: ./tools/wineinstall -��α׷�� "wine ��α׷��"ó�� մϴ�. �� ڼ�� -�� ذ� �� κа� Wine �� Ͻʽÿ�. -Ư�� http://www.winehq.org ��Ʈ�� Ǿ� �ֽ��ϴ�. +프로그램을 실행할 때는 "wine 프로그램명"처럼 합니다. 더 자세한 정보 +및 문제 해결 방법은 이 파일의 나머지 부분과 Wine 맨페이지를 참조하십시오. +특히 http://www.winehq.org 사이트에 방대한 정보가 집약되어 있습니다. -3. ��忡 �ʿ�� +3. 빌드에 필요한 조건 -Wine�� ϰ� ��Ϸ�� ϳ�� ʿ��մϴ�: +Wine을 컴파일하고 실행하려면 다음 중 하나가 필요합니다: - �� 2.0.36 �Ǵ� �� ̻� - FreeBSD 5.3 �Ǵ� �� ̻� - Solaris x86 2.5 �Ǵ� �� ̻� + 리눅스 2.0.36 또는 그 이상 + FreeBSD 5.3 또는 그 이상 + Solaris x86 2.5 또는 그 이상 NetBSD-current - Mac OS X 10.5 �Ǵ� �� ̻� + Mac OS X 10.5 또는 그 이상 -Wine�� Ϸ�� Ŀ�� ʿ��ϱ� �� -��  ü�� մϴ�. -Ŀ�� 带 ��ϴ� ��Ÿ �ٸ� � ü�� Դϴ�. +Wine을 실행하려면 커널 차원의 스레드 지원이 필요하기 때문에 현재는 여기 +나열한 운영 체제만 지원합니다. +커널 스레드를 지원하는 기타 다른 운영 체제는 향후 지원할 예정입니다. -�� : - �� 2.2.x�� 2.0.x�� - �ְ� �׷�� ֽ��ϴ�(�ʱ� 2.0.x �� - ��α׷�� ). �� 2.4.x�� 2.6.x �� ֱ� Ŀ�� ϱ� - �ٶ��ϴ�. +리눅스 정보: + 리눅스 2.2.x에서는 잘 실행될 것이지만 리눅스 2.0.x에서는 실행될 수도 + 있고 그렇지 않을 수도 있습니다(초기 2.0.x 버전에서는 스레드 관련 문제로 + 프로그램이 죽음). 가급적 2.4.x와 2.6.x 같은 최근 커널을 사용하기 + 바랍니다. -FreeBSD ��: - FreeBSD 4.x �� 5.x�� FreeBSD 5.3 �� - �� ʽ��ϴ�. +FreeBSD 정보: + FreeBSD 4.x 및 5.x에서 빌드되지만 FreeBSD 5.3 이전 버전에선 제대로 + 동작하지 않습니다. - �� ڼ�� + 더 자세한 정보는 <ftp://ftp.freebsd.org/pub/FreeBSD/ports/ports/emulators/wine/> - �� ִ� FreeBSD ports �� Ͻʽÿ�. + 에 있는 FreeBSD ports 페이지를 참조하십시오. -Solaris ��: - �� κ�� Wine�� Ϸ�� GNU ��ü��(gcc, gas ��)�� ؾ� - �մϴ�. ��: gas�� ܼ�� ġ�ϱ⸸ �ϸ� gcc�� - �ֽ��ϴ�. gas�� ġ�� gcc�� ϰų� cc, as, ld �� - GNU ��̳ʸ�� ɺ� ��ũ�� ɾ� �ִ� �� ʿ��ϴٰ� �մϴ�. +Solaris 정보: + 거의 대부분의 경우 Wine을 빌드하려면 GNU 툴체인(gcc, gas 등)을 사용해야 + 합니다. 경고: gas를 단순히 설치하기만 하면 gcc에서 사용되지 않을 수도 + 있습니다. gas를 설치한 다음 gcc를 재컴파일하거나 cc, as, ld 명령을 + GNU 바이너리로 심볼 링크를 걸어 주는 일이 필요하다고 합니다. -NetBSD ��: - USER_LDT, SYSVSHM, SYSVSEM, SYSVMSG �ɼ�� Ŀ�ο� ��ԵǾ� �־�� մϴ�. +NetBSD 정보: + USER_LDT, SYSVSHM, SYSVSEM, SYSVMSG 옵션이 커널에 포함되어 있어야 합니다. -Mac OS X ��: - x86 �ӽſ�� Ϸ�� Xcode 2.4 �Ǵ� �� ̻�� ʿ��մϴ�. +Mac OS X 정보: + x86 머신에서 빌드하려면 Xcode 2.4 또는 그 이상이 필요합니다. -��Ǵ� �� ý��: - Wine�� κ�� ý��ۿ�� ˴ϴ�. �׷�� /tmp - ��丮�� umsdos Ÿ�� Ʈ�� 쿡�� α׷�� - �ʽ��ϴ�. Samba�� ̿��ؼ� �� ׼��ϴ� �� ȣȯ�� - �� Ǳ⵵ �߽��ϴ�. �� NTFS�� ũ ��Ͻ� �� - ��Ǿ� �� ʽ��ϴ�. Windows ��α׷�� κ� ��ũ ��򰡿� - ��͸� ��ϹǷ� NTFS�� ʴ� �� ϴ�. NTFS - �� ġ�� Ͻñ� �ٶ��ϴ�. - -�ʼ� �� : - X11 ��߿� �� ġ�Ǿ� �־�� մϴ�(��ȿ�� xlib6g-dev, - ��޿�� XFree86-devel�̶� ��Ű�� Ǿ� ��). +지원되는 파일 시스템: + Wine은 대부분의 파일 시스템에서 문제없이 실행됩니다. 그렇지만 /tmp + 디렉토리가 umsdos 타입으로 마운트된 경우에는 프로그램이 실행되지 + 않습니다. Samba를 이용해서 파일을 액세스하는 경우 몇 가지 호환성 + 문제가 보고되기도 했습니다. 또한 NTFS는 현재 디스크 기록시 안정성이 + 보장되어 있지 않습니다. Windows 프로그램은 대부분 디스크 어딘가에 + 데이터를 기록하므로 NTFS는 가급적 사용하지 않는 것이 좋습니다. NTFS + 파일의 경우 쓰기 가능한 위치로 복사한 다음 사용하시기 바랍니다. -�ʼ� �� : - x86 �ý��ۿ�� gcc 2.7.2 �̻�� ʿ��մϴ�. - 2.7.2.3 �� ȭ �ɼ�� Ѱ� ��ϸ� �� Ͽ�� - �߻�� ִµ�, ��κ� �� õ� �� ͵��Դϴ�. +필수 구성 요소: + X11 개발용 헤더 파일이 설치되어 있어야 합니다(데비안에서는 xlib6g-dev, + 레드햇에서는 XFree86-devel이란 패키지명으로 되어 있음). - "make" ��α׷�� 翬�� ʼ��Դϴ�(�� κ� GNU make ��). +필수 빌드 도구: + x86 시스템에서는 gcc 2.7.2 이상이 필요합니다. + 2.7.2.3 이전 버전은 최적화 옵션을 켜고 컴파일하면 몇몇 파일에서 문제가 + 발생할 수 있는데, 대부분 헤더 파일 관리와 관련된 문제로 인한 것들입니다. - flex �� 2.5 �̻�� bison�� ʿ��մϴ�. + "make" 프로그램은 당연히 필수입니다(거의 대부분 GNU make 사용). -�� ̺귯��: - �� ̺귯�� ./configure --verbose �� - Ȯ�� ֽ��ϴ�. + flex 버전 2.5 이상과 bison이 필요합니다. +선택적 라이브러리: + 포함 여부의 선택이 가능한 라이브러리는 ./configure --verbose 명령으로 + 확인할 수 있습니다. -4. ��ϱ� -wineinstall�� ʴ� �� Ἥ Wine�� մϴ�: +4. 컴파일하기 + +wineinstall을 사용하지 않는 경우 다음 명령을 써서 Wine을 빌드합니다: ./configure make depend make -�̷�� ϸ� "wine" ��α׷�� ټ�� ̺귯��/��̳ʸ�� ˴ϴ�. -"wine" ��α׷�� Windows �� ε��ϰ� ��ϴ� �� ˴ϴ�. -"libwine" ��̺귯��("Winelib")�� Windows �ҽ� �ڵ带 ��н� �󿡼� -��ϰ� ��ũ�ϴ� �뵵�� ֽ��ϴ�. +이렇게 하면 "wine" 프로그램과 다수의 라이브러리/바이너리가 빌드됩니다. +"wine" 프로그램은 Windows 실행 파일을 로드하고 실행하는 데 사용됩니다. +"libwine" 라이브러리("Winelib")는 Windows 소스 코드를 유닉스 상에서 +컴파일하고 링크하는 용도로 사용할 수 있습니다. -�� ɼ�� ./configure --help �� մϴ�. +컴파일 설정 옵션을 보려면 ./configure --help 명령을 사용합니다. -��ġ �� Ἥ �� ׷��̵��Ϸ�� ֻ�� -��丮(README �� ִ� ��丮)�� ϴ�. �׷� �� -"make clean" �� ϰ� �Ʒ� �� ҽ�� ġ�մϴ�: +패치 파일을 써서 새 릴리스로 업그레이드하려면 먼저 릴리스의 최상위 +디렉토리(README 파일이 들어 있는 디렉토리)로 갑니다. 그런 다음 +"make clean" 명령을 실행하고 아래 명령으로 소스를 패치합니다: bunzip2 -c patch-file | patch -p1 -"patch-file"�� ġ �� ̸��Դϴ�(wine-0.9.x.diff.bz2 �� ). -��ġ�� "./configure", "make depend && make"�� ʷ� -��ϸ� �˴ϴ�. +"patch-file"은 패치 파일의 이름입니다(wine-0.9.x.diff.bz2 등의 형태). +패치한 다음에는 "./configure", "make depend && make"를 차례로 +실행하면 됩니다. -5. �� +5. 설정 -Wine�� ϴ� �� "make install" �� -�� ϰ� ��, ��Ÿ �ʿ�� ý��ۿ� ��ġ�� ֽ��ϴ�. +Wine이 일단 정상적으로 빌드된 다음에는 "make install" 명령으로 +실행 파일과 맨페이지, 기타 필요한 파일을 시스템에 설치할 수 있습니다. -��ġ�ϱ� �� Wine�� ؾ� �Ѵٴ� �� ñ� -�ٶ��ϴ�. "dpkg -r wine" �Ǵ� "rpm -e wine" �Ǵ� "make uninstall" �� -�� ֽ��ϴ�. +설치하기 전 이전 버전의 Wine을 제거해야 한다는 점을 잊지 마시기 +바랍니다. "dpkg -r wine" 또는 "rpm -e wine" 또는 "make uninstall" 등의 +명령으로 이전 버전을 제거할 수 있습니다. -�� http://www.winehq.org/�� Support �� ֽ��ϴ�. +설정 관련 도움말은 http://www.winehq.org/의 Support 페이지에 있습니다. -��̺귯�� ε� ��("Error while loading shared libraries: libntdll.so")�� -�߻��ϴ� �� ̺귯�� ΰ� /etc/ld.so.conf �� ȿ� ��Ǿ� �ִ�� -Ȯ�� root �� ldconfig�� Ͻʽÿ�. +라이브러리 로딩 에러("Error while loading shared libraries: libntdll.so")가 +발생하는 경우 라이브러리 경로가 /etc/ld.so.conf 파일 안에 지정되어 있는지 +확인한 다음 root 권한으로 ldconfig를 실행하십시오. -6. ��α׷� �� +6. 프로그램 실행 -Wine�� ü ��θ� �� ְ� ��ϸ�� -�� ֽ��ϴ�. +Wine을 실행할 때 실행 파일의 전체 경로를 지정할 수도 있고 파일명만 지정할 +수도 있습니다. -�� ī��̸� ��Ϸ��: +예를 들어 카드놀이를 실행하려면: - wine sol (�� ã�� Ͽ� �� - wine sol.exe �˻� ��θ� �̿�) + wine sol (파일을 찾기 위해 설정 파일에 지정된 + wine sol.exe 검색 경로를 이용) - wine c:\\windows\\sol.exe (DOS ��ϸ� �� ̿�) + wine c:\\windows\\sol.exe (DOS 파일명 문법을 이용) - wine /usr/windows/sol.exe (��н� ��ϸ� �� ̿�) + wine /usr/windows/sol.exe (유닉스 파일명 문법을 이용) wine sol.exe /parameter1 -parameter2 parameter3 - (��α׷�� ȣ�� Ķ��͸� �Ѱ��) + (프로그램을 호출할 때 파라미터를 넘겨줌) -Wine�� ϼ� �ܰ迡 �� ߱� �� α׷�� -�� ֽ��ϴ�. ��α׷�� ״� �� м��ϰ� �� ֵ�� -�� ڵ� ��Ե˴ϴ�. �ڼ�� Wine �� ̵�� -�� Ͻñ� �ٶ��ϴ�. +Wine은 아직 완성 단계에 도달하지 못했기 때문에 프로그램이 제대로 실행되지 +않을 수 있습니다. 프로그램이 죽는 경우 문제를 분석하고 수정할 수 있도록 +디버그 모드로 자동 진입됩니다. 자세한 디버깅 방법은 Wine 개발자 가이드의 +디버깅 섹션을 참조하시기 바랍니다. -7. �� ڼ�� +7. 더 자세한 정보 -WWW: �� Wine ��̵�, ��ø��̼� ��ͺ��̽�, �� - http://www.winehq.org/ �� ִ� WineHQ ��Ʈ�� - �� ֽ��ϴ�. �� ã�� 밳 �� Ʈ�� ˴ϴ�. +WWW: 여러 종류의 Wine 가이드, 애플리케이션 데이터베이스, 버그 추적 등 + http://www.winehq.org/ 에 있는 WineHQ 사이트에 가면 많은 정보를 얻을 + 수 있습니다. 정보를 찾을 때 대개 이 사이트가 출발점이 됩니다. -FAQ: Wine FAQ�� http://www.winehq.org/FAQ �� ֽ��ϴ�. +FAQ: Wine FAQ은 http://www.winehq.org/FAQ 에 있습니다. -Usenet: Wine �� ϰų� �� comp.emulators.ms-windows.wine - �׷�� ̿��ϱ� �ٶ��ϴ�. +Usenet: Wine 관련 주제를 논의하거나 도움을 받으려면 comp.emulators.ms-windows.wine + 그룹을 이용하기 바랍니다. -Bugs: http://bugs.winehq.org �� Wine Bugzilla�� ׸� ��Ͻʽÿ�. - �� ϱ� �� ̹� �� ִ�� - ��ͺ��̽� �˻�� Ȯ��ϱ� �ٶ��ϴ�. - comp.emulators.ms-windows.wine �׷쿡 �� ÷�� ˴ϴ�. +Bugs: http://bugs.winehq.org 의 Wine Bugzilla에 버그를 보고하십시오. + 버그 보고서를 제출하기 전 같은 문제가 이미 제출된 적이 있는지 + 데이터베이스 검색을 통해 확인하기 바랍니다. + comp.emulators.ms-windows.wine 그룹에 버그 보고서를 올려도 됩니다. -IRC: irc.freenode.net �� #WineHQ ä�ο�� ֽ��ϴ�. +IRC: irc.freenode.net 의 #WineHQ 채널에서 도움을 받을 수 있습니다. -GIT: Wine �� Ʈ�� GIT�� ǰ� �ֽ��ϴ�. �� ڼ�� - http://www.winehq.org/site/git �� ϱ� �ٶ��ϴ�. +GIT: Wine 개발 트리는 현재 GIT로 관리되고 있습니다. 더 자세한 정보는 + http://www.winehq.org/site/git 를 참조하기 바랍니다. -��ϸ� ��Ʈ: - Wine ��ڿ� ��ڸ� �� ϸ� ��Ʈ�� �ǰ� �ֽ��ϴ�. - �� ڼ�� http://www.winehq.org/forums �� ϱ� �ٶ��ϴ�. +메일링 리스트: + Wine 사용자와 개발자를 위해 메일링 리스트가 운영되고 있습니다. + 더 자세한 정보는 http://www.winehq.org/forums 를 참조하기 바랍니다. -��Ű: Wine ��Ű�� http://wiki.winehq.org �� ֽ��ϴ�. +위키: Wine 위키는 http://wiki.winehq.org 에 있습니다. -�߰�� ̳� �� װ� �ִٸ� �� Ե� �� ֵ�� -wine-devel(a)winehq.org ��ϸ� ��Ʈ�� ġ('diff -u' �� )�� -�ֽñ� �ٶ��ϴ�. +추가할 내용이나 수정할 버그가 있다면 다음번 릴리스에 포함될 수 있도록 +wine-devel(a)winehq.org 메일링 리스트로 패치('diff -u' 형식으로 된)를 보내 +주시기 바랍니다. -- Alexandre Julliard diff --git a/documentation/README.pt b/documentation/README.pt index b0914f2098..3f3ff2cc5e 100644 --- a/documentation/README.pt +++ b/documentation/README.pt @@ -1,26 +1,26 @@ -1. INTRODU��O +1. INTRODUÇÃO -Wine � um programa que permite correr programas Microsoft Windows -(incluindo DOS, Windows 3.x e Win32 execut�veis) em Unix. -Consiste num carregador (loader), que carrega e executa um bin�rio -Microsoft Windows, e uma livraria (chamada Winelib) que implementa -Windows API calls usando o Unix ou X11 equivalentes. A livraria tamb�m -pode ser usada para "porting" Win32 c�digo para execut�veis do nativo Unix . +Wine é um programa que permite correr programas Microsoft Windows +(incluindo DOS, Windows 3.x e Win32 executáveis) em Unix. +Consiste num carregador (loader), que carrega e executa um binário +Microsoft Windows, e uma livraria (chamada Winelib) que implementa +Windows API calls usando o Unix ou X11 equivalentes. A livraria também +pode ser usada para "porting" Win32 código para executáveis do nativo Unix . -Wine � software gr�tis,autorizado segundo a GNU LGPL; ver o ficheiro -LICEN�A para os detalhes. +Wine é software grátis,autorizado segundo a GNU LGPL; ver o ficheiro +LICENÇA para os detalhes. -2.ARRANQUE R�PIDO +2.ARRANQUE RÁPIDO -Sempre que se compila da source, � recomendado que se use o Wine -Installer para construir e instalar o Wine. Desde a primeira directoria -do Wine source (que cont�m este ficheiro),corre: +Sempre que se compila da source, é recomendado que se use o Wine +Installer para construir e instalar o Wine. Desde a primeira directoria +do Wine source (que contém este ficheiro),corre: ./tools/wineinstall -Corre os programas conforme as "wine [options] program". Para mais -informa��es e reso�u��o de problemas. L� o resto deste ficheiro, a Wine -man page, e especialmente a abund�ncia de informa��o encontrada em +Corre os programas conforme as "wine [options] program". Para mais +informações e resoçução de problemas. Lê o resto deste ficheiro, a Wine +man page, e especialmente a abundância de informação encontrada em http://www.winehq.org. 3.REQUERIMENTOS @@ -32,128 +32,128 @@ Para compilar e correr o Wine, deves ter o seguinte: Solaris x86 2.5 ou seguinte NetBSD-current -Como o Wine requer sequ�ncias kernel-level para poder correr, apenas -os sistemas operativos acima mencionados s�o suportados. -Outros sistemas operativos que suportam sequ�ncias kernel, talvez +Como o Wine requer sequências kernel-level para poder correr, apenas +os sistemas operativos acima mencionados são suportados. +Outros sistemas operativos que suportam sequências kernel, talvez venham a ser suportados no futuro. Linux info: -Enquanto o Linux 2.2.x ir� sobretudo trabalhar e Linux 2.0.x poder� -ir� contudo trabalhar (vers�es 2.0.x antigas tem mal funcionamento -relacionados a tarefas), ser� muito melhor teres um kernel atualizado +Enquanto o Linux 2.2.x irá sobretudo trabalhar e Linux 2.0.x poderá +irá contudo trabalhar (versões 2.0.x antigas tem mal funcionamento +relacionados a tarefas), será muito melhor teres um kernel atualizado como 2.4.x. FreeBSD info: -Wine dever� construir no FreeBSD 4.x e FreeBSD 5.x, mas vers�es anteriores -a FreeBSD 5.3 geralmente n�o trabalham corretamente. +Wine deverá construir no FreeBSD 4.x e FreeBSD 5.x, mas versões anteriores +a FreeBSD 5.3 geralmente não trabalham corretamente. -Mais informa��es encontra-se em: +Mais informações encontra-se em: ftp://ftp.freebsd.org/pub/FreeBSD/ports/ports/emulators/wine/ Solaris info: -Tu ir�s provavelmente ter que construir o Wine com as ferramentas GNU -(gcc, gas, etc.). Aviso: ao instalar gas *n�o* assegura que ser� usado -pelo gcc. Recompilar o gcc depois de instalar o gas ou symking cc, as e -ld para as ferramentas gnu � dito que � necess�rio. +Tu irás provavelmente ter que construir o Wine com as ferramentas GNU +(gcc, gas, etc.). Aviso: ao instalar gas *não* assegura que será usado +pelo gcc. Recompilar o gcc depois de instalar o gas ou symking cc, as e +ld para as ferramentas gnu é dito que é necessário. NetBSD info: -Certifica-te que tens as op��es USER_LDT, SYSVSHM, SYSVSEM, e SYSVMSG +Certifica-te que tens as opções USER_LDT, SYSVSHM, SYSVSEM, e SYSVMSG ligadas ao teu kernel. File systems info: -O Wine dever� correr na maioria dos file systems. Contudo, o Wine falha -no aranque se umsdos � usado para a directoria /tmp. Alguns problemas de -compatibilidades foram relatados estando a usar ficheiros acessados -atrav�s do Samba. Tamb�m, como o NTFS apenas pode ser usado com -seguran�a com acesso readonly por agora, n�s n�o recomendamos o uso de +O Wine deverá correr na maioria dos file systems. Contudo, o Wine falha +no aranque se umsdos é usado para a directoria /tmp. Alguns problemas de +compatibilidades foram relatados estando a usar ficheiros acessados +através do Samba. Também, como o NTFS apenas pode ser usado com +segurança com acesso readonly por agora, nós não recomendamos o uso de NTFS. Como os programas de Windows precisam de acesso write em quase tudo. -No caso de NTFS files, copia por cima para uma localiza��o em que se +No caso de NTFS files, copia por cima para uma localização em que se possa escrever. -Requisitos b�sicos: +Requisitos básicos: Tu precisas de ter instalados os fucheiros de include do X11 development (chamados xlib6g-dev em Debian e Xfree86-devel no RedHat). -Requisitos para as ferramentas de constru��o: -Em sistemas x86 o gcc >= 2.7.2 � requerido. -Vers�es anteriores � 2.7.2.3 poder�o ter problemas quando certos -ficheiros s�o compilados com optimiza��o, frequentemente devido a -problemas relacionados com as gest�es dos cabe�alhos dos ficheiros. -Actualmente o pgcc n�o trabalha com o Wine. A causa deste problema � +Requisitos para as ferramentas de construção: +Em sistemas x86 o gcc >= 2.7.2 é requerido. +Versões anteriores à 2.7.2.3 poderão ter problemas quando certos +ficheiros são compilados com optimização, frequentemente devido a +problemas relacionados com as gestôes dos cabeçalhos dos ficheiros. +Actualmente o pgcc não trabalha com o Wine. A causa deste problema é desconhecida. -Claro que tamb�m precisas fazer "make" (geralmente como o GNU make). +Claro que também precisas fazer "make" (geralmente como o GNU make). -Tu tamb�m necessitas do flex versao 2.5 ou superior e o bison. +Tu também necessitas do flex versao 2.5 ou superior e o bison. Se estiveres a usar RedHat ou Debian, instala os pacotes do flex e do bison. Bibliotecas de suporte opcionais: -Se desejares suporte de impress�o do CUPS, por favor instala os pacotes +Se desejares suporte de impressão do CUPS, por favor instala os pacotes cups e cups-devel. -4.COMPILA��O +4.COMPILAÇÃO -No caso de escolheres n�o usar wineinstall, corre os seguintes comandos +No caso de escolheres não usar wineinstall, corre os seguintes comandos para contruir o Wine: ./configure make depend make -Isto ir� contruir o programa "wine" e numerosos suportes livraris/binarios. -O programa "wine" ir� carregar e correr executaveis do Windows. -A livraria "libwine" ("winelib") pode ser usada para compilar e ligar +Isto irá contruir o programa "wine" e numerosos suportes livraris/binarios. +O programa "wine" irá carregar e correr executaveis do Windows. +A livraria "libwine" ("winelib") pode ser usada para compilar e ligar Windows source code sob o Unix. -Para ver as op��es de compila��o da configura��o, faz ./configure -help. +Para ver as opções de compilação da configuração, faz ./configure -help. -Para fazeres o upgrade de uma nova vers�o atravez de um ficheiro patch, -primeiro cd para a directoria top da distribui��o (a que contem este -ficheiro README). A seguir faz um "make clean", e faz o patch da -distribui��o com: +Para fazeres o upgrade de uma nova versão atravez de um ficheiro patch, +primeiro cd para a directoria top da distribuição (a que contem este +ficheiro README). A seguir faz um "make clean", e faz o patch da +distribuição com: gunzip -c patch-file | patch -p1 -onde "patch-file" � o nome do ficheiro patch ( qualquer coisa como -Wine.yymmdd.diff.gz). Tu podes entao correr fazendo "./configure", e +onde "patch-file" é o nome do ficheiro patch ( qualquer coisa como +Wine.yymmdd.diff.gz). Tu podes entao correr fazendo "./configure", e depois corre "make depend && make" 5.SETUP -Uma vez o Wine contruido correctamente, tu podes entao fazer o "make -install"; isto ir� instalar o wine executavel, o Wine man page, e alguns -outros ficheiros necess�rios. +Uma vez o Wine contruido correctamente, tu podes entao fazer o "make +install"; isto irá instalar o wine executavel, o Wine man page, e alguns +outros ficheiros necessários. -N�o esquecer de primeiro desinstalar qualquer previo conflito relativo a -instala��o do Wine. -Tenta outro "dpkg -r wine" ou "rpm -e wine" ou "make uninstall" antes de +Não esquecer de primeiro desinstalar qualquer previo conflito relativo a +instalação do Wine. +Tenta outro "dpkg -r wine" ou "rpm -e wine" ou "make uninstall" antes de installar. -Ver http://www.winehq.org/support/ para informa��o sobre a -configura�ao. +Ver http://www.winehq.org/support/ para informação sobre a +configuraçao. -No caso da livraria carregar erros (e.g. "Error while loading shared -libraries: libntdll.so"), tem a certeza de adicionar o caminho da +No caso da livraria carregar erros (e.g. "Error while loading shared +libraries: libntdll.so"), tem a certeza de adicionar o caminho da livraria para /etc/ld.so.conf e correr ldconfig como root. -Para verificar a correc��o do ambiente, tu precisas para que o Wine +Para verificar a correcção do ambiente, tu precisas para que o Wine corra com sucesso, tu podes correr "./tools/winecheck | less". -Tu ir�s obter uma percentagem do resultado indicando "Wine configuration +Tu irás obter uma percentagem do resultado indicando "Wine configuration correctness". -Como este programa � alpha, ainda n�o correu um verdadeiro e exaustivo -teste, onde, ent�o deve ser levado apenas como um primeiro passo de -verifica��o. +Como este programa é alpha, ainda não correu um verdadeiro e exaustivo +teste, onde, então deve ser levado apenas como um primeiro passo de +verificação. -Ver wine.confman page, como se muda apenas para o suporte em modo texto +Ver wine.confman page, como se muda apenas para o suporte em modo texto se desejado. 6.CORRER PROGRAMAS -Quando e invoca o Wine, tens que especificar o caminho (patch) complecto +Quando e invoca o Wine, tens que especificar o caminho (patch) complecto do executavel, ou apenas o nome do ficheiro. -Por exemplo: para correr o Solit�rio: +Por exemplo: para correr o Solitário: wine sol (usando o searchpatch para lozalizar o ficheiro) wine sol.exe @@ -161,49 +161,49 @@ Por exemplo: para correr o Solit wine /usr/windows/sol.exe (usando um nome de ficheiro Unix) -Nota: o caminho do ficheiro tamb�m ir� ser adicionado ao caminho(patch) -quando um nome complecto � fornecido na linha de comando. +Nota: o caminho do ficheiro também irá ser adicionado ao caminho(patch) +quando um nome complecto é fornecido na linha de comando. -O Wine ainda n�o est� complecto.ent�o poder�o v�rios programas -quebrar(crash). Providenciamos-te bem para que o winedbg esteja -correctamente e de acordo com a documentation/debugger.sgml, sera-te -dado um detector de erros (debugger) para que possas investigar e +O Wine ainda não está complecto.então poderão vários programas +quebrar(crash). Providenciamos-te bem para que o winedbg esteja +correctamente e de acordo com a documentation/debugger.sgml, sera-te +dado um detector de erros (debugger) para que possas investigar e corrigir os problemas. -Para mais informa��o como em fazer isto ou aquilo, por favor l� o +Para mais informação como em fazer isto ou aquilo, por favor lê o ficheiro documentation/debugging.sgml. -Tu deves fazer um backup de todos os teus ficheiros importantes em que -destes acesso ao Wine, ou usa uma especial c�pia deles.tem havido casos -de certos users que t�m feito relatos de ficheiros corronpidos. N�o -corrar o Explorer, por exemplo, se n�o tiveres um backup pr�prio, que -por vezes renomeia e estraga algumas directorias. Nem todos os MS apps -como o e.g. Messenger s�o seguros, ao correrem o Explorer de alguma -maneira. Este caso particular de corrupe�ao (!$!$!$!$.pfr) podem ao +Tu deves fazer um backup de todos os teus ficheiros importantes em que +destes acesso ao Wine, ou usa uma especial cópia deles.tem havido casos +de certos users que têm feito relatos de ficheiros corronpidos. Não +corrar o Explorer, por exemplo, se não tiveres um backup próprio, que +por vezes renomeia e estraga algumas directorias. Nem todos os MS apps +como o e.g. Messenger são seguros, ao correrem o Explorer de alguma +maneira. Este caso particular de corrupeçao (!$!$!$!$.pfr) podem ao menos parcialmente podem ser corrigidos usando http://home.nexgo.de/andi.mohr/download/decorrupt_explorer -7.ARRANJAR MAIS INFORMA��O +7.ARRANJAR MAIS INFORMAÇÃO -www: Uma grande quantidade de informa��o acerca do Wine est� disponivel - pelo WineHQ em http://www.winehq.org/ : varios guias Wine, base de - dados de aplica��es, localiza�ao de erros. Isto � provavelmente o - melhor ponto de come�o. +www: Uma grande quantidade de informação acerca do Wine está disponivel + pelo WineHQ em http://www.winehq.org/ : varios guias Wine, base de + dados de aplicações, localizaçao de erros. Isto é provavelmente o + melhor ponto de começo. -FAQ: A Wine FAQ est� localizada em http://www.winehq.org/FAQ +FAQ: A Wine FAQ está localizada em http://www.winehq.org/FAQ -Usenet: Tu podes discutor t�picos relacionados de Wine e obter ajuda em +Usenet: Tu podes discutor tópicos relacionados de Wine e obter ajuda em comp.emulators.ms-windows.wine. -IRC: Ajuda online est� disponivel em #WineHQ on irc.freenode.net. +IRC: Ajuda online está disponivel em #WineHQ on irc.freenode.net. -Git: O currente desenvolvimento do Wine est� disponivel por Git. - Vai a http://www.winehq.org/git para mais informa��o. +Git: O currente desenvolvimento do Wine está disponivel por Git. + Vai a http://www.winehq.org/git para mais informação. Mailing Lists: - H� algumas mailing list para responsaveis pelo desenvolvimento Wine; ver em - http://www.winehq.org/forums para mais informa��o. + Há algumas mailing list para responsaveis pelo desenvolvimento Wine; ver em + http://www.winehq.org/forums para mais informação. -Se tu acrescentaste algo,ou corrigiste um bug, por favor envia um patch -(em 'diff -u' format) para wine-devel(a)winehq.org lista para inclus�o -no pr�ximo lan�amento. +Se tu acrescentaste algo,ou corrigiste um bug, por favor envia um patch +(em 'diff -u' format) para wine-devel(a)winehq.org lista para inclusão +no próximo lançamento. diff --git a/documentation/README.pt_br b/documentation/README.pt_br index a2cccac88e..01e0be773a 100644 --- a/documentation/README.pt_br +++ b/documentation/README.pt_br @@ -1,125 +1,125 @@ -1. INTRODU��O +1. INTRODUÇÃO -Wine � um programa que permite executar programas Microsoft Windows -(incluindo execut�veis DOS, Windows 3.x, Win32 e Win64) no Unix. -Constitu�do de um programa carregador (loader) que carrega e executa -um bin�rio Microsoft Windows, e uma biblioteca (chamada Winelib) que +Wine é um programa que permite executar programas Microsoft Windows +(incluindo executáveis DOS, Windows 3.x, Win32 e Win64) no Unix. +Constituído de um programa carregador (loader) que carrega e executa +um binário Microsoft Windows, e uma biblioteca (chamada Winelib) que implementa chamadas da API do Windows usando os equivalentes do Unix -ou do X11. A biblioteca tamb�m pode ser usada para portar c�digo -Win32 em execut�veis nativos Unix. +ou do X11. A biblioteca também pode ser usada para portar código +Win32 em executáveis nativos Unix. -Wine � software livre, liberado segundo a GNU LGPL; veja o arquivo +Wine é software livre, liberado segundo a GNU LGPL; veja o arquivo LICENSE para detalhes. -2. IN�CIO R�PIDO +2. INÍCIO RÁPIDO -Sempre que se compilam os fontes, � recomendado usar o Wine Installer -para construir e instalar o Wine. Estando no diret�rio de mais alto -n�vel do c�digo fonte do Wine, execute: +Sempre que se compilam os fontes, é recomendado usar o Wine Installer +para construir e instalar o Wine. Estando no diretório de mais alto +nível do código fonte do Wine, execute: ./tools/wineinstall -Execute programas conforme "wine programa". Para maiores informa��es -e resolu��o de problemas, leia o restante deste arquivo, a p�gina -"man" do Wine (man wine), e especialmente a abund�ncia de informa��o +Execute programas conforme "wine programa". Para maiores informações +e resolução de problemas, leia o restante deste arquivo, a página +"man" do Wine (man wine), e especialmente a abundância de informação encontrada em http://www.winehq.org. 3. REQUERIMENTOS -Para compilar e executar o Wine, voc� deve ter o seguinte: +Para compilar e executar o Wine, você deve ter o seguinte: - Linux vers�o 2.0.36 ou posterior + Linux versão 2.0.36 ou posterior FreeBSD 8.0 ou posterior Solaris x86 9 ou posterior NetBSD-atual Mac OS X 10.5 ou posterior -Como o Wine requer suporte a tarefas no n�vel de kernel para executar, -somente os sistemas operacionais acima mencionados s�o suportados. -Outros sistemas operacionais que suportarem tarefas do kernel poder�o +Como o Wine requer suporte a tarefas no nível de kernel para executar, +somente os sistemas operacionais acima mencionados são suportados. +Outros sistemas operacionais que suportarem tarefas do kernel poderão ter suporte no futuro. -Informa��es para o FreeBSD: - O Wine em geral n�o deve funcionar corretamente em vers�es antes da 8.0. - Veja http://wiki.freebsd.org/Wine para mais informa��es. +Informações para o FreeBSD: + O Wine em geral não deve funcionar corretamente em versões antes da 8.0. + Veja http://wiki.freebsd.org/Wine para mais informações. -Informa��es para o Solaris: - Voc� provavelmente necessitar� construir o Wine com as ferramentas GNU - (gcc, gas, etc.). Aviso: instalar gas N�O assegura que ser� usado pelo - gcc. Recompilar o gcc depois de instalar o gas ou criar uma liga��o ao - cc, as e ld para as ferramentas gnu � dito ser necess�rio. +Informações para o Solaris: + Você provavelmente necessitará construir o Wine com as ferramentas GNU + (gcc, gas, etc.). Aviso: instalar gas NÃO assegura que será usado pelo + gcc. Recompilar o gcc depois de instalar o gas ou criar uma ligação ao + cc, as e ld para as ferramentas gnu é dito ser necessário. -Informa��es para o NetBSD: - Certifique-se de ter as op��es USER_LDT, SYSVSHM, SYSVSEM, e SYSVMSG +Informações para o NetBSD: + Certifique-se de ter as opções USER_LDT, SYSVSHM, SYSVSEM, e SYSVMSG ligadas no kernel. -Informa��es para Mac OS X: - Ser� necess�rio o Xcode 2.4 ou superior para compilar corretamente no x86. - O driver gr�fico Mac requer OS X 10.6 ou superior e n�o ser� usado no 10.5. +Informações para Mac OS X: + Será necessário o Xcode 2.4 ou superior para compilar corretamente no x86. + O driver gráfico Mac requer OS X 10.6 ou superior e não será usado no 10.5. Sistemas de arquivo suportados: O Wine deve rodar na maioria dos sistemas de arquivos. Alguns problemas de - compatibilidade foram reportados quando usado via Samba. Al�m disso, o NTFS - n�o prov� todas as funcionalidades necess�rias para alguns aplicativos. - Usar uma parti��o nativa Unix � recomendado. + compatibilidade foram reportados quando usado via Samba. Além disso, o NTFS + não provê todas as funcionalidades necessárias para alguns aplicativos. + Usar uma partição nativa Unix é recomendado. -Requisitos b�sicos: - Voc� necessita ter instalados os arquivos de inclus�o para desenvolvimento +Requisitos básicos: + Você necessita ter instalados os arquivos de inclusão para desenvolvimento do X11 (chamados de xlib6g-dev no Debian e XFree86-devel no RedHat). - Obviamente voc� tamb�m ir� precisar do "make" (comumente o GNU make). + Obviamente você também irá precisar do "make" (comumente o GNU make). - Tamb�m ser� necess�rio o flex vers�o 2.5.33 ou superior e o bison. + Também será necessário o flex versão 2.5.33 ou superior e o bison. Bibliotecas de suporte opcionais: - O script configure ir� mostrar diversas mensagens quando bibliotecas - opcionais n�o forem encontradas no seu sistema. + O script configure irá mostrar diversas mensagens quando bibliotecas + opcionais não forem encontradas no seu sistema. Veja http://wiki.winehq.org/Recommended_Packages para dicas sobre - pacotes que voc� pode instalar. + pacotes que você pode instalar. - Em plataformas de 64 bits, se compilar Wine como 32 bits (padr�o), voc� - precisa assegurar que as vers�es 32 bits das bibliotecas est�o instaladas, + Em plataformas de 64 bits, se compilar Wine como 32 bits (padrão), você + precisa assegurar que as versões 32 bits das bibliotecas estão instaladas, veja http://wiki.winehq.org/WineOn64bit para mais detalhes. - Se voc� quer um verdadeiro Wine de 64 bits (ou uma configura��o mista de + Se você quer um verdadeiro Wine de 64 bits (ou uma configuração mista de 32 e 64 bits) veja http://wiki.winehq.org/Wine64 para mais detalhes. -4. COMPILA��O +4. COMPILAÇÃO -No caso de escolher n�o usar o wineinstall, execute os comandos a seguir +No caso de escolher não usar o wineinstall, execute os comandos a seguir para construir o Wine: ./configure make -Isto construir� o programa "wine" e v�rios bin�rios/bibliotecas de suporte. -O programa "wine" carregar� e executar� execut�veis do Windows. +Isto construirá o programa "wine" e vários binários/bibliotecas de suporte. +O programa "wine" carregará e executará executáveis do Windows. A biblioteca "libwine" ("Winelib") pode ser usada para compilar e ligar -c�digo-fonte do Windows sob o Unix. +código-fonte do Windows sob o Unix. -Para ver as op��es de compila��o da configura��o, rode ./configure --help. +Para ver as opções de compilação da configuração, rode ./configure --help. -5. CONFIGURA��O +5. CONFIGURAÇÃO -Uma vez que o Wine esteja constru�do corretamente, voc� pode executar -"make install"; assim ir� instalar o execut�vel do wine, as p�ginas -"man" do Wine, e outros arquivos necess�rios. +Uma vez que o Wine esteja construído corretamente, você pode executar +"make install"; assim irá instalar o executável do wine, as páginas +"man" do Wine, e outros arquivos necessários. -N�o esque�a de desinstalar primeiramente qualquer instala��o pr�via do +Não esqueça de desinstalar primeiramente qualquer instalação prévia do Wine que possa ser conflitante. Tente tanto "dpkg -r wine", "rpm -e wine" ou "make uninstall" antes de instalar. -Depois de instalado, pode-se executar o programa de configura��o "winecfg". -Veja a �rea de suporte em http://www.winehq.org/ para dicas de configura��o. +Depois de instalado, pode-se executar o programa de configuração "winecfg". +Veja a área de suporte em http://www.winehq.org/ para dicas de configuração. 6. EXECUTANDO PROGRAMAS -Ao invocar o Wine, voc� pode especificar o caminho completo do execut�vel, +Ao invocar o Wine, você pode especificar o caminho completo do executável, ou somente um nome de arquivo. Por exemplo, para executar o bloco de notas: @@ -132,42 +132,42 @@ Por exemplo, para executar o bloco de notas: wine ~/.wine/drive_c/windows/notepad.exe (usando um nome de arquivo Unix) - wine notepad.exe leiame.txt (chamando o programa com par�metros) + wine notepad.exe leiame.txt (chamando o programa com parâmetros) -O Wine n�o � perfeito, ent�o alguns programas podem travar. Se isso -acontecer voc� ver� um registro do travamento (crash log) que voc� -poder� anexar ao bug que for criar. +O Wine não é perfeito, então alguns programas podem travar. Se isso +acontecer você verá um registro do travamento (crash log) que você +poderá anexar ao bug que for criar. -7. OBTENDO MAIS INFORMA��O +7. OBTENDO MAIS INFORMAÇÃO -WWW: Uma grande quantidade de informa��o sobre o Wine est� dispon�vel - no WineHQ em http://www.winehq.org/ : v�rios guias do Wine, base - de dados de aplica��es, rastreamento de erros. Este � provavelmente - o melhor ponto para come�ar. +WWW: Uma grande quantidade de informação sobre o Wine está disponível + no WineHQ em http://www.winehq.org/ : vários guias do Wine, base + de dados de aplicações, rastreamento de erros. Este é provavelmente + o melhor ponto para começar. -FAQ: O FAQ (perguntas frequentes) do Wine est� em http://www.winehq.org/FAQ +FAQ: O FAQ (perguntas frequentes) do Wine está em http://www.winehq.org/FAQ -Wiki: O wiki do Wine est� dispon�vel em http://wiki.winehq.org +Wiki: O wiki do Wine está disponível em http://wiki.winehq.org -Listas de discuss�o: - H� diversas listas de mensagens para usu�rios e colaboradores no +Listas de discussão: + Há diversas listas de mensagens para usuários e colaboradores no desenvolvimento do Wine; veja http://www.winehq.org/forums para - mais informa��o. + mais informação. Bugs: Relate erros ao Bugzilla do Wine em http://bugs.winehq.org Por favor, pesquise a base de dados do bugzilla para verificar - se seu problema j� foi encontrado ou resolvido antes de enviar - um relat�rio do erro. + se seu problema já foi encontrado ou resolvido antes de enviar + um relatório do erro. -IRC: A ajuda online est� dispon�vel em #WineHQ em irc.freenode.net. +IRC: A ajuda online está disponível em #WineHQ em irc.freenode.net. -Git: A �rvore de desenvolvimento atual do Wine est� dispon�vel por Git. - Visite http://www.winehq.org/git para mais informa��o. +Git: A árvore de desenvolvimento atual do Wine está disponível por Git. + Visite http://www.winehq.org/git para mais informação. -Se voc� alterar algo ou reparar um erro, envie, por favor, um patch -(preferencialmente usando git-format-patch) � lista wine-devel(a)winehq.org -para inclus�o na pr�xima distribui��o. +Se você alterar algo ou reparar um erro, envie, por favor, um patch +(preferencialmente usando git-format-patch) à lista wine-devel(a)winehq.org +para inclusão na próxima distribuição. -- Arquivo original escrito por: @@ -175,7 +175,7 @@ Alexandre Julliard julliard(a)winehq.org -- -Tradu��o para Portugu�s do Brasil: +Tradução para Português do Brasil: Marcelo Duarte wine-devel(a)bol.com.br -- 2.15.1

1 0

[PATCH 3/4] d2d1: Implement ID2D1Factory1.
by Henri Verbeet 05 Dec '17

05 Dec '17

From: Lucian Poston <lucian.poston(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d2d1/d2d1_private.h | 2 +- dlls/d2d1/factory.c | 182 ++++++++++++++++++++++++++++++++++++----------- dlls/uuid/d2d.c | 2 +- include/d2d1_1.idl | 136 +++++++++++++++++++++++++++++++++++ 4 files changed, 278 insertions(+), 44 deletions(-) create mode 100644 include/d2d1_1.idl diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 98298f8..3b21bc1 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -24,7 +24,7 @@ #include <assert.h> #include <limits.h> #define COBJMACROS -#include "d2d1.h" +#include "d2d1_1.h" #ifdef D2D1_INIT_GUID #include "initguid.h" #endif diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 4b9315f..da2b892 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d2d); struct d2d_factory { - ID2D1Factory ID2D1Factory_iface; + ID2D1Factory1 ID2D1Factory1_iface; LONG refcount; ID3D10Device1 *device; @@ -35,9 +35,9 @@ struct d2d_factory float dpi_y; }; -static inline struct d2d_factory *impl_from_ID2D1Factory(ID2D1Factory *iface) +static inline struct d2d_factory *impl_from_ID2D1Factory1(ID2D1Factory1 *iface) { - return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory_iface); + return CONTAINING_RECORD(iface, struct d2d_factory, ID2D1Factory1_iface); } static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) @@ -58,14 +58,15 @@ static HRESULT d2d_factory_reload_sysmetrics(struct d2d_factory *factory) return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory *iface, REFIID iid, void **out) +static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory1 *iface, REFIID iid, void **out) { TRACE("iface %p, iid %s, out %p.\n", iface, debugstr_guid(iid), out); - if (IsEqualGUID(iid, &IID_ID2D1Factory) + if (IsEqualGUID(iid, &IID_ID2D1Factory1) + || IsEqualGUID(iid, &IID_ID2D1Factory) || IsEqualGUID(iid, &IID_IUnknown)) { - ID2D1Factory_AddRef(iface); + ID2D1Factory1_AddRef(iface); *out = iface; return S_OK; } @@ -76,9 +77,9 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_QueryInterface(ID2D1Factory *iface, return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory *iface) +static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory1 *iface) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); ULONG refcount = InterlockedIncrement(&factory->refcount); TRACE("%p increasing refcount to %u.\n", iface, refcount); @@ -86,9 +87,9 @@ static ULONG STDMETHODCALLTYPE d2d_factory_AddRef(ID2D1Factory *iface) return refcount; } -static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory *iface) +static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory1 *iface) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); ULONG refcount = InterlockedDecrement(&factory->refcount); TRACE("%p decreasing refcount to %u.\n", iface, refcount); @@ -103,18 +104,18 @@ static ULONG STDMETHODCALLTYPE d2d_factory_Release(ID2D1Factory *iface) return refcount; } -static HRESULT STDMETHODCALLTYPE d2d_factory_ReloadSystemMetrics(ID2D1Factory *iface) +static HRESULT STDMETHODCALLTYPE d2d_factory_ReloadSystemMetrics(ID2D1Factory1 *iface) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); TRACE("iface %p.\n", iface); return d2d_factory_reload_sysmetrics(factory); } -static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory *iface, float *dpi_x, float *dpi_y) +static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory1 *iface, float *dpi_x, float *dpi_y) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); TRACE("iface %p, dpi_x %p, dpi_y %p.\n", iface, dpi_x, dpi_y); @@ -122,7 +123,7 @@ static void STDMETHODCALLTYPE d2d_factory_GetDesktopDpi(ID2D1Factory *iface, flo *dpi_y = factory->dpi_y; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factory1 *iface, const D2D1_RECT_F *rect, ID2D1RectangleGeometry **geometry) { struct d2d_geometry *object; @@ -133,7 +134,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_rectangle_geometry_init(object, iface, rect))) + if (FAILED(hr = d2d_rectangle_geometry_init(object, (ID2D1Factory *)iface, rect))) { WARN("Failed to initialize rectangle geometry, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -146,7 +147,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRectangleGeometry(ID2D1Factor return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D1Factory1 *iface, const D2D1_ROUNDED_RECT *rect, ID2D1RoundedRectangleGeometry **geometry) { FIXME("iface %p, rect %p, geometry %p stub!\n", iface, rect, geometry); @@ -154,7 +155,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateRoundedRectangleGeometry(ID2D return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory1 *iface, const D2D1_ELLIPSE *ellipse, ID2D1EllipseGeometry **geometry) { FIXME("iface %p, ellipse %p, geometry %p stub!\n", iface, ellipse, geometry); @@ -162,7 +163,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateEllipseGeometry(ID2D1Factory return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory1 *iface, D2D1_FILL_MODE fill_mode, ID2D1Geometry **geometries, UINT32 geometry_count, ID2D1GeometryGroup **group) { FIXME("iface %p, fill_mode %#x, geometries %p, geometry_count %u, group %p stub!\n", @@ -171,7 +172,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGeometryGroup(ID2D1Factory *i return E_NOTIMPL; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Factory1 *iface, ID2D1Geometry *src_geometry, const D2D1_MATRIX_3X2_F *transform, ID2D1TransformedGeometry **transformed_geometry) { @@ -183,7 +184,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_transformed_geometry_init(object, iface, src_geometry, transform); + d2d_transformed_geometry_init(object, (ID2D1Factory *)iface, src_geometry, transform); TRACE("Created transformed geometry %p.\n", object); *transformed_geometry = (ID2D1TransformedGeometry *)&object->ID2D1Geometry_iface; @@ -191,7 +192,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateTransformedGeometry(ID2D1Fact return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory *iface, ID2D1PathGeometry **geometry) +static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory1 *iface, ID2D1PathGeometry **geometry) { struct d2d_geometry *object; @@ -200,7 +201,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory *if if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_path_geometry_init(object, iface); + d2d_path_geometry_init(object, (ID2D1Factory *)iface); TRACE("Created path geometry %p.\n", object); *geometry = (ID2D1PathGeometry *)&object->ID2D1Geometry_iface; @@ -208,7 +209,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry(ID2D1Factory *if return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory1 *iface, const D2D1_STROKE_STYLE_PROPERTIES *desc, const float *dashes, UINT32 dash_count, ID2D1StrokeStyle **stroke_style) { @@ -221,7 +222,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory *ifa if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_stroke_style_init(object, iface, desc, dashes, dash_count))) + if (FAILED(hr = d2d_stroke_style_init(object, (ID2D1Factory *)iface, desc, dashes, dash_count))) { WARN("Failed to initialize stroke style, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -234,7 +235,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle(ID2D1Factory *ifa return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factory1 *iface, const D2D1_DRAWING_STATE_DESCRIPTION *desc, IDWriteRenderingParams *text_rendering_params, ID2D1DrawingStateBlock **state_block) { @@ -246,7 +247,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock(ID2D1Factor if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - d2d_state_block_init(object, iface, desc, text_rendering_params); + d2d_state_block_init(object, (ID2D1Factory *)iface, desc, text_rendering_params); TRACE("Created state block %p.\n", object); *state_block = &object->ID2D1DrawingStateBlock_iface; @@ -266,10 +267,10 @@ static HRESULT d2d_factory_get_device(struct d2d_factory *factory, ID3D10Device1 return hr; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Factory1 *iface, IWICBitmap *target, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); struct d2d_wic_render_target *object; ID3D10Device1 *device; HRESULT hr; @@ -285,7 +286,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa return hr; } - if (FAILED(hr = d2d_wic_render_target_init(object, iface, device, target, desc))) + if (FAILED(hr = d2d_wic_render_target_init(object, (ID2D1Factory *)iface, device, target, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -298,11 +299,11 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateWicBitmapRenderTarget(ID2D1Fa return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory1 *iface, const D2D1_RENDER_TARGET_PROPERTIES *desc, const D2D1_HWND_RENDER_TARGET_PROPERTIES *hwnd_rt_desc, ID2D1HwndRenderTarget **render_target) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); struct d2d_hwnd_render_target *object; ID3D10Device1 *device; HRESULT hr; @@ -315,7 +316,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_hwnd_render_target_init(object, iface, device, desc, hwnd_rt_desc))) + if (FAILED(hr = d2d_hwnd_render_target_init(object, (ID2D1Factory *)iface, device, desc, hwnd_rt_desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -328,18 +329,18 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateHwndRenderTarget(ID2D1Factory return S_OK; } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDxgiSurfaceRenderTarget(ID2D1Factory1 *iface, IDXGISurface *surface, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1RenderTarget **render_target) { TRACE("iface %p, surface %p, desc %p, render_target %p.\n", iface, surface, desc, render_target); - return d2d_d3d_create_render_target(iface, surface, NULL, desc, render_target); + return d2d_d3d_create_render_target((ID2D1Factory *)iface, surface, NULL, desc, render_target); } -static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory *iface, +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory1 *iface, const D2D1_RENDER_TARGET_PROPERTIES *desc, ID2D1DCRenderTarget **render_target) { - struct d2d_factory *factory = impl_from_ID2D1Factory(iface); + struct d2d_factory *factory = impl_from_ID2D1Factory1(iface); struct d2d_dc_render_target *object; ID3D10Device1 *device; HRESULT hr; @@ -352,7 +353,7 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory * if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = d2d_dc_render_target_init(object, iface, device, desc))) + if (FAILED(hr = d2d_dc_render_target_init(object, (ID2D1Factory *)iface, device, desc))) { WARN("Failed to initialize render target, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -365,7 +366,94 @@ static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDCRenderTarget(ID2D1Factory * return S_OK; } -static const struct ID2D1FactoryVtbl d2d_factory_vtbl = +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDevice(ID2D1Factory1 *iface, + IDXGIDevice *dxgi_device, ID2D1Device **device) +{ + FIXME("iface %p, dxgi_device %p, device %p stub!\n", iface, dxgi_device, device); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateStrokeStyle1(ID2D1Factory1 *iface, + const D2D1_STROKE_STYLE_PROPERTIES1 *desc, const float *dashes, UINT32 dash_count, + ID2D1StrokeStyle1 **stroke_style) +{ + FIXME("iface %p, desc %p, dashes %p, dash_count %u, stroke_style %p stub!\n", + iface, desc, dashes, dash_count, stroke_style); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_CreatePathGeometry1(ID2D1Factory1 *iface, ID2D1PathGeometry1 **geometry) +{ + FIXME("iface %p, geometry %p stub!\n", iface, geometry); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateDrawingStateBlock1(ID2D1Factory1 *iface, + const D2D1_DRAWING_STATE_DESCRIPTION1 *desc, IDWriteRenderingParams *text_rendering_params, + ID2D1DrawingStateBlock1 **state_block) +{ + FIXME("iface %p, desc %p, text_rendering_params %p, state_block %p stub!\n", + iface, desc, text_rendering_params, state_block); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_CreateGdiMetafile(ID2D1Factory1 *iface, + IStream *stream, ID2D1GdiMetafile **metafile) +{ + FIXME("iface %p, stream %p, metafile %p stub!\n", iface, stream, metafile); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromStream(ID2D1Factory1 *iface, + REFCLSID effect_id, IStream *property_xml, const D2D1_PROPERTY_BINDING *bindings, + UINT32 binding_count, PD2D1_EFFECT_FACTORY effect_factory) +{ + FIXME("iface %p, effect_id %s, property_xml %p, bindings %p, binding_count %u, effect_factory %p stub!\n", + iface, debugstr_guid(effect_id), property_xml, bindings, binding_count, effect_factory); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_RegisterEffectFromString(ID2D1Factory1 *iface, + REFCLSID effect_id, const WCHAR *property_xml, const D2D1_PROPERTY_BINDING *bindings, + UINT32 binding_count, PD2D1_EFFECT_FACTORY effect_factory) +{ + FIXME("iface %p, effect_id %s, property_xml %s, bindings %p, binding_count %u, effect_factory %p stub!\n", + iface, debugstr_guid(effect_id), debugstr_w(property_xml), bindings, binding_count, effect_factory); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_UnregisterEffect(ID2D1Factory1 *iface, REFCLSID effect_id) +{ + FIXME("iface %p, effect_id %s stub!\n", iface, debugstr_guid(effect_id)); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_GetRegisteredEffects(ID2D1Factory1 *iface, + CLSID *effects, UINT32 effect_count, UINT32 *returned, UINT32 *registered) +{ + FIXME("iface %p, effects %p, effect_count %u, returned %p, registered %p stub!\n", + iface, effects, effect_count, returned, registered); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d2d_factory_GetEffectProperties(ID2D1Factory1 *iface, + REFCLSID effect_id, ID2D1Properties **props) +{ + FIXME("iface %p, effect_id %s, props %p stub!\n", iface, debugstr_guid(effect_id), props); + + return E_NOTIMPL; +} + +static const struct ID2D1Factory1Vtbl d2d_factory_vtbl = { d2d_factory_QueryInterface, d2d_factory_AddRef, @@ -384,6 +472,16 @@ static const struct ID2D1FactoryVtbl d2d_factory_vtbl = d2d_factory_CreateHwndRenderTarget, d2d_factory_CreateDxgiSurfaceRenderTarget, d2d_factory_CreateDCRenderTarget, + d2d_factory_CreateDevice, + d2d_factory_CreateStrokeStyle1, + d2d_factory_CreatePathGeometry1, + d2d_factory_CreateDrawingStateBlock1, + d2d_factory_CreateGdiMetafile, + d2d_factory_RegisterEffectFromStream, + d2d_factory_RegisterEffectFromString, + d2d_factory_UnregisterEffect, + d2d_factory_GetRegisteredEffects, + d2d_factory_GetEffectProperties, }; static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE factory_type, @@ -394,7 +492,7 @@ static void d2d_factory_init(struct d2d_factory *factory, D2D1_FACTORY_TYPE fact if (factory_options && factory_options->debugLevel != D2D1_DEBUG_LEVEL_NONE) WARN("Ignoring debug level %#x.\n", factory_options->debugLevel); - factory->ID2D1Factory_iface.lpVtbl = &d2d_factory_vtbl; + factory->ID2D1Factory1_iface.lpVtbl = &d2d_factory_vtbl; factory->refcount = 1; d2d_factory_reload_sysmetrics(factory); } @@ -415,8 +513,8 @@ HRESULT WINAPI D2D1CreateFactory(D2D1_FACTORY_TYPE factory_type, REFIID iid, TRACE("Created factory %p.\n", object); - hr = ID2D1Factory_QueryInterface(&object->ID2D1Factory_iface, iid, factory); - ID2D1Factory_Release(&object->ID2D1Factory_iface); + hr = ID2D1Factory1_QueryInterface(&object->ID2D1Factory1_iface, iid, factory); + ID2D1Factory1_Release(&object->ID2D1Factory1_iface); return hr; } diff --git a/dlls/uuid/d2d.c b/dlls/uuid/d2d.c index dbe143e..d2cf6db 100644 --- a/dlls/uuid/d2d.c +++ b/dlls/uuid/d2d.c @@ -18,4 +18,4 @@ #include "d3d10_1.h" #include "initguid.h" -#include "d2d1.h" +#include "d2d1_1.h" diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl new file mode 100644 index 0000000..1fbbb30 --- /dev/null +++ b/include/d2d1_1.idl @@ -0,0 +1,136 @@ +/* + * Copyright 2017 Lucian Poston + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "d2d1.idl"; + +interface ID2D1Device; +interface ID2D1StrokeStyle1; +interface ID2D1PathGeometry1; +interface ID2D1DrawingStateBlock1; +interface ID2D1GdiMetafile; +interface ID2D1Properties; + +typedef enum D2D1_STROKE_TRANSFORM_TYPE +{ + D2D1_STROKE_TRANSFORM_TYPE_NORMAL = 0x0, + D2D1_STROKE_TRANSFORM_TYPE_FIXED = 0x1, + D2D1_STROKE_TRANSFORM_TYPE_HAIRLINE = 0x2, + D2D1_STROKE_TRANSFORM_TYPE_FORCE_DWORD = 0xffffffff, +} D2D1_STROKE_TRANSFORM_TYPE; + +typedef enum D2D1_PRIMITIVE_BLEND +{ + D2D1_PRIMITIVE_BLEND_SOURCE_OVER = 0x0, + D2D1_PRIMITIVE_BLEND_COPY = 0x1, + D2D1_PRIMITIVE_BLEND_MIN = 0x2, + D2D1_PRIMITIVE_BLEND_ADD = 0x3, + D2D1_PRIMITIVE_BLEND_MAX = 0x4, + D2D1_PRIMITIVE_BLEND_FORCE_DWORD = 0xffffffff, +} D2D1_PRIMITIVE_BLEND; + +typedef enum D2D1_UNIT_MODE +{ + D2D1_UNIT_MODE_DIPS = 0x0, + D2D1_UNIT_MODE_PIXELS = 0x1, + D2D1_UNIT_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_UNIT_MODE; + +typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING; + +typedef struct D2D1_STROKE_STYLE_PROPERTIES1 +{ + D2D1_CAP_STYLE startCap; + D2D1_CAP_STYLE endCap; + D2D1_CAP_STYLE dashCap; + D2D1_LINE_JOIN lineJoin; + float miterLimit; + D2D1_DASH_STYLE dashStyle; + float dashOffset; + D2D1_STROKE_TRANSFORM_TYPE transformType; +} D2D1_STROKE_STYLE_PROPERTIES1; + +typedef struct D2D1_DRAWING_STATE_DESCRIPTION1 +{ + D2D1_ANTIALIAS_MODE antialiasMode; + D2D1_TEXT_ANTIALIAS_MODE textAntialiasMode; + D2D1_TAG tag1; + D2D1_TAG tag2; + D2D1_MATRIX_3X2_F transform; + D2D1_PRIMITIVE_BLEND primitiveBlend; + D2D1_UNIT_MODE unitMode; +} D2D1_DRAWING_STATE_DESCRIPTION1; + +typedef HRESULT (__stdcall *PD2D1_EFFECT_FACTORY)(IUnknown **effect); + +[ + object, + uuid(bb12d362-daee-4b9a-aa1d-14ba401cfa1f), + local, +] +interface ID2D1Factory1 : ID2D1Factory +{ + HRESULT CreateDevice( + [in] IDXGIDevice *dxgi_device, + [out] ID2D1Device **device + ); + HRESULT CreateStrokeStyle( + [in] const D2D1_STROKE_STYLE_PROPERTIES1 *desc, + [in, size_is(dash_count)] const float *dashes, + [in] UINT32 dash_count, + [out] ID2D1StrokeStyle1 **stroke_style + ); + HRESULT CreatePathGeometry( + [out] ID2D1PathGeometry1 **geometry + ); + HRESULT CreateDrawingStateBlock( + [in] const D2D1_DRAWING_STATE_DESCRIPTION1 *desc, + [in] IDWriteRenderingParams *text_rendering_params, + [out] ID2D1DrawingStateBlock1 **state_block + ); + HRESULT CreateGdiMetafile( + [in] IStream *stream, + [out] ID2D1GdiMetafile **metafile + ); + HRESULT RegisterEffectFromStream( + [in] REFCLSID effect_id, + [in] IStream *property_xml, + [in, size_is(binding_count)] const D2D1_PROPERTY_BINDING *bindings, + [in] UINT32 binding_count, + [in] PD2D1_EFFECT_FACTORY effect_factory + ); + HRESULT RegisterEffectFromString( + [in] REFCLSID effect_id, + [in] const WCHAR *property_xml, + [in, size_is(binding_count)] const D2D1_PROPERTY_BINDING *bindings, + [in] UINT32 binding_count, + [in] PD2D1_EFFECT_FACTORY effect_factory + ); + HRESULT UnregisterEffect( + [in] REFCLSID effect_id + ); + HRESULT GetRegisteredEffects( + [out, size_is(effect_count)] CLSID *effects, + [in] UINT32 effect_count, + [out] UINT32 *returned, + [out] UINT32 *registered + ); + HRESULT GetEffectProperties( + [in] REFCLSID effect_id, + [out] ID2D1Properties **props + ); +} -- 2.1.4

1 0

[PATCH 2/4] ddraw/tests: Redundant mode sets are broken on Windows 10.
by Henri Verbeet 05 Dec '17

05 Dec '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/ddraw/tests/ddraw1.c | 8 +++++--- dlls/ddraw/tests/ddraw2.c | 8 +++++--- dlls/ddraw/tests/ddraw4.c | 8 +++++--- dlls/ddraw/tests/ddraw7.c | 8 +++++--- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 5ab1c80..c306c4d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2281,9 +2281,9 @@ static void test_redundant_mode_set(void) { DDSURFACEDESC surface_desc = {0}; IDirectDraw *ddraw; + RECT q, r, s; HWND window; HRESULT hr; - RECT r, s; ULONG ref; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, @@ -2302,7 +2302,8 @@ static void test_redundant_mode_set(void) U1(surface_desc.ddpfPixelFormat).dwRGBBitCount); ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); - GetWindowRect(window, &r); + GetWindowRect(window, &q); + r = q; r.right /= 2; r.bottom /= 2; SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); @@ -2314,7 +2315,8 @@ static void test_redundant_mode_set(void) ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); GetWindowRect(window, &s); - ok(EqualRect(&r, &s), "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); + ok(EqualRect(&r, &s) || broken(EqualRect(&q, &s) /* Windows 10 */), + "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); ref = IDirectDraw_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ca349be..8a7801e 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -2414,9 +2414,9 @@ static void test_redundant_mode_set(void) { DDSURFACEDESC surface_desc = {0}; IDirectDraw2 *ddraw; + RECT q, r, s; HWND window; HRESULT hr; - RECT r, s; ULONG ref; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, @@ -2435,7 +2435,8 @@ static void test_redundant_mode_set(void) U1(surface_desc.ddpfPixelFormat).dwRGBBitCount, 0, 0); ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); - GetWindowRect(window, &r); + GetWindowRect(window, &q); + r = q; r.right /= 2; r.bottom /= 2; SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); @@ -2447,7 +2448,8 @@ static void test_redundant_mode_set(void) ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); GetWindowRect(window, &s); - ok(EqualRect(&r, &s), "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); + ok(EqualRect(&r, &s) || broken(EqualRect(&q, &s) /* Windows 10 */), + "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); ref = IDirectDraw2_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index bad06ea..048331d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2552,9 +2552,9 @@ static void test_redundant_mode_set(void) { DDSURFACEDESC2 surface_desc = {0}; IDirectDraw4 *ddraw; + RECT q, r, s; HWND window; HRESULT hr; - RECT r, s; ULONG ref; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, @@ -2573,7 +2573,8 @@ static void test_redundant_mode_set(void) U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); - GetWindowRect(window, &r); + GetWindowRect(window, &q); + r = q; r.right /= 2; r.bottom /= 2; SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); @@ -2585,7 +2586,8 @@ static void test_redundant_mode_set(void) ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); GetWindowRect(window, &s); - ok(EqualRect(&r, &s), "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); + ok(EqualRect(&r, &s) || broken(EqualRect(&q, &s) /* Windows 10 */), + "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); ref = IDirectDraw4_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 5e176c7..d1ff85d 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2279,9 +2279,9 @@ static void test_redundant_mode_set(void) { DDSURFACEDESC2 surface_desc = {0}; IDirectDraw7 *ddraw; + RECT q, r, s; HWND window; HRESULT hr; - RECT r, s; ULONG ref; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, @@ -2299,7 +2299,8 @@ static void test_redundant_mode_set(void) U1(U4(surface_desc).ddpfPixelFormat).dwRGBBitCount, 0, 0); ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); - GetWindowRect(window, &r); + GetWindowRect(window, &q); + r = q; r.right /= 2; r.bottom /= 2; SetWindowPos(window, HWND_TOP, r.left, r.top, r.right, r.bottom, 0); @@ -2311,7 +2312,8 @@ static void test_redundant_mode_set(void) ok(SUCCEEDED(hr), "SetDisplayMode failed, hr %#x.\n", hr); GetWindowRect(window, &s); - ok(EqualRect(&r, &s), "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); + ok(EqualRect(&r, &s) || broken(EqualRect(&q, &s) /* Windows 10 */), + "Expected %s, got %s.\n", wine_dbgstr_rect(&r), wine_dbgstr_rect(&s)); ref = IDirectDraw7_Release(ddraw); ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); -- 2.1.4

1 0

[PATCH 1/4] d3d10core/tests: Introduce a format compatibility test.
by Henri Verbeet 05 Dec '17

05 Dec '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3d10core/tests/device.c | 136 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 4228773..cdac5ec 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -13021,6 +13021,141 @@ static void test_stream_output_resume(void) release_test_context(&test_context); } +static void test_format_compatibility(void) +{ + ID3D10Texture2D *dst_texture, *src_texture; + D3D10_SUBRESOURCE_DATA resource_data; + D3D10_TEXTURE2D_DESC texture_desc; + struct resource_readback rb; + DWORD colour, expected; + ID3D10Device *device; + unsigned int i, j; + ULONG refcount; + HRESULT hr; + + static const struct + { + DXGI_FORMAT src_format; + DXGI_FORMAT dst_format; + size_t texel_size; + BOOL success; + } + test_data[] = + { + {DXGI_FORMAT_R8G8B8A8_TYPELESS, DXGI_FORMAT_R8G8B8A8_UNORM, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM_SRGB, DXGI_FORMAT_R8G8B8A8_UINT, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R8G8B8A8_SNORM, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_SNORM, DXGI_FORMAT_R8G8B8A8_SINT, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_SINT, DXGI_FORMAT_R8G8B8A8_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_B8G8R8A8_UNORM, 4, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UINT, DXGI_FORMAT_R16G16_UINT, 4, FALSE}, + {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R16G16_FLOAT, 4, TRUE}, + {DXGI_FORMAT_R16G16_FLOAT, DXGI_FORMAT_R16G16_UNORM, 4, TRUE}, + {DXGI_FORMAT_R16G16_UNORM, DXGI_FORMAT_R16G16_UINT, 4, TRUE}, + {DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16_SNORM, 4, TRUE}, + {DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16_SINT, 4, TRUE}, + {DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16_TYPELESS, 4, TRUE}, + {DXGI_FORMAT_R16G16_TYPELESS, DXGI_FORMAT_R32_TYPELESS, 4, FALSE}, + {DXGI_FORMAT_R32G32_TYPELESS, DXGI_FORMAT_R32G32_FLOAT, 8, TRUE}, + {DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32_UINT, 8, TRUE}, + {DXGI_FORMAT_R32G32_UINT, DXGI_FORMAT_R32G32_SINT, 8, TRUE}, + {DXGI_FORMAT_R32G32_SINT, DXGI_FORMAT_R32G32_TYPELESS, 8, TRUE}, + }; + static const DWORD initial_data[16] = {0}; + static const DWORD bitmap_data[] = + { + 0xff0000ff, 0xff00ffff, 0xff00ff00, 0xffffff00, + 0xffff0000, 0xffff00ff, 0xff000000, 0xff7f7f7f, + 0xffffffff, 0xffffffff, 0xffffffff, 0xff000000, + 0xffffffff, 0xff000000, 0xff000000, 0xff000000, + }; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + texture_desc.Height = 4; + texture_desc.MipLevels = 1; + texture_desc.ArraySize = 1; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + for (i = 0; i < ARRAY_SIZE(test_data); ++i) + { + unsigned int x, y, texel_dwords; + D3D10_BOX box; + + texture_desc.Width = sizeof(bitmap_data) / (texture_desc.Height * test_data[i].texel_size); + texture_desc.Format = test_data[i].src_format; + texture_desc.Usage = D3D10_USAGE_IMMUTABLE; + + resource_data.pSysMem = bitmap_data; + resource_data.SysMemPitch = texture_desc.Width * test_data[i].texel_size; + resource_data.SysMemSlicePitch = 0; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &src_texture); + ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr); + + texture_desc.Format = test_data[i].dst_format; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + + resource_data.pSysMem = initial_data; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); + if (FAILED(hr) && test_data[i].dst_format == DXGI_FORMAT_B8G8R8A8_UNORM) + { + skip("B8G8R8A8_UNORM not supported, skipping test.\n"); + ID3D10Texture2D_Release(src_texture); + continue; + } + ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr); + + set_box(&box, 0, 0, 0, texture_desc.Width - 1, texture_desc.Height - 1, 1); + ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, 1, 1, 0, + (ID3D10Resource *)src_texture, 0, &box); + + texel_dwords = test_data[i].texel_size / sizeof(DWORD); + get_texture_readback(dst_texture, 0, &rb); + for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + { + x = j % 4; + y = j / 4; + colour = get_readback_color(&rb, x, y); + expected = test_data[i].success && x >= texel_dwords && y + ? bitmap_data[j - (4 + texel_dwords)] : initial_data[j]; + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); + } + release_resource_readback(&rb); + + ID3D10Device_CopyResource(device, (ID3D10Resource *)dst_texture, (ID3D10Resource *)src_texture); + + get_texture_readback(dst_texture, 0, &rb); + for (j = 0; j < ARRAY_SIZE(bitmap_data); ++j) + { + x = j % 4; + y = j / 4; + colour = get_readback_color(&rb, x, y); + expected = test_data[i].success ? bitmap_data[j] : initial_data[j]; + ok(colour == expected, "Test %u: Got unexpected colour 0x%08x at (%u, %u), expected 0x%08x.\n", + i, colour, x, y, expected); + } + release_resource_readback(&rb); + + ID3D10Texture2D_Release(dst_texture); + ID3D10Texture2D_Release(src_texture); + } + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { test_feature_level(); @@ -13094,4 +13229,5 @@ START_TEST(device) test_geometry_shader(); test_stream_output(); test_stream_output_resume(); + test_format_compatibility(); } -- 2.1.4

1 0

[PATCH 2/2] mshtml: Added IDOMEvent::get_timeStamp implementation.
by Jacek Caban 05 Dec '17

05 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/dispex.c | 3 ++- dlls/mshtml/htmlevent.c | 16 ++++++++++++++-- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/tests/events.js | 41 ++++++++++++++++++++++++++++++++++++++++- 4 files changed, 57 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] jscript: Support VT_UI8 in variant_to_jsval.
by Jacek Caban 05 Dec '17

05 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/jsutils.c | 7 +++++++ 1 file changed, 7 insertions(+)

1 0

[PATCH 1/6] d3d11: Validate MiscFlags for 3D textures.
by Matteo Bruni 05 Dec '17

05 Dec '17

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3d11/texture.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 12186dcf37..e8870d5d9a 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -942,6 +942,14 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi unsigned int levels; HRESULT hr; + if (desc->MiscFlags & D3D11_RESOURCE_MISC_GENERATE_MIPS + && (~desc->BindFlags & (D3D11_BIND_RENDER_TARGET | D3D11_BIND_SHADER_RESOURCE))) + { + WARN("D3D11_RESOURCE_MISC_GENERATE_MIPS used without D3D11_BIND_RENDER_TARGET " + "and D3D11_BIND_SHADER_RESOURCE.\n"); + return E_INVALIDARG; + } + texture->ID3D11Texture3D_iface.lpVtbl = &d3d11_texture3d_vtbl; texture->ID3D10Texture3D_iface.lpVtbl = &d3d10_texture3d_vtbl; texture->refcount = 1; -- 2.13.6

3 14

[PATCH v3 3/3] ntdll: Don't require full-page reads in NtReadFileScatter
by Andrew Eikum 05 Dec '17

05 Dec '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v3: Always SetLastError before checking GLE return. dlls/kernel32/tests/file.c | 22 +++++++++++++++++++++- dlls/ntdll/file.c | 5 ++--- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 28d11a4fd3..ead3d2c297 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,7 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID wbuf = NULL, rbuf1, rbuf2; + char *wbuf = NULL, *rbuf1, *rbuf2; BOOL br; ret = GetTempPathA( MAX_PATH, temp_path ); @@ -4460,6 +4460,26 @@ static void test_WriteFileGather(void) ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, "data should not have been read into buffer\n" ); + /* partial page read */ + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + SetLastError(0xdeadbeef); + br = ReadFileScatter( hfile, fse, si.dwPageSize / 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + memset( rbuf2, 0, si.dwPageSize ); + ok( memcmp( rbuf1 + si.dwPageSize / 2, rbuf2, si.dwPageSize - si.dwPageSize / 2 ) == 0, + "invalid data was read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 6c3b571638..db45a5bcf3 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1041,7 +1041,6 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap TRACE( "(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p),partial stub!\n", file, event, apc, apc_user, io_status, segments, length, offset, key); - if (length % page_size) return STATUS_INVALID_PARAMETER; if (!io_status) return STATUS_ACCESS_VIOLATION; status = server_get_unix_fd( file, FILE_READ_DATA, &unix_handle, @@ -1060,9 +1059,9 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap { if (offset && offset->QuadPart != FILE_USE_FILE_POINTER_POSITION) result = pread( unix_handle, (char *)segments->Buffer + pos, - page_size - pos, offset->QuadPart + total ); + min( length - pos, page_size - pos ), offset->QuadPart + total ); else - result = read( unix_handle, (char *)segments->Buffer + pos, page_size - pos ); + result = read( unix_handle, (char *)segments->Buffer + pos, min( length - pos, page_size - pos ) ); if (result == -1) { -- 2.15.1

1 0

[PATCH v3 2/3] ntdll: Don't return an error when reading past EOF in NtReadFileScatter
by Andrew Eikum 05 Dec '17

05 Dec '17

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- v3: Always SetLastError before checking GLE return. dlls/kernel32/tests/file.c | 28 +++++++++++++++++++++++++++- dlls/ntdll/file.c | 8 +++----- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index a8d229c887..28d11a4fd3 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,7 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID wbuf = NULL, rbuf1; + LPVOID wbuf = NULL, rbuf1, rbuf2; BOOL br; ret = GetTempPathA( MAX_PATH, temp_path ); @@ -4378,6 +4378,9 @@ static void test_WriteFileGather(void) rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + rbuf2 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf2 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); memset( wbuf, 0x42, si.dwPageSize ); @@ -4435,11 +4438,34 @@ static void test_WriteFileGather(void) ok( povl == NULL, "wrong ovl %p\n", povl ); } + /* read past EOF */ + memset( &ovl, 0, sizeof(ovl) ); + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + fse[1].Buffer = rbuf2; + memset( rbuf1, 0, si.dwPageSize ); + memset( rbuf2, 0x17, si.dwPageSize ); + SetLastError(0xdeadbeef); + br = ReadFileScatter( hfile, fse, si.dwPageSize * 2, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + memset( rbuf1, 0x17, si.dwPageSize ); + ok( memcmp( rbuf2, rbuf1, si.dwPageSize ) == 0, + "data should not have been read into buffer\n" ); + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); VirtualFree( wbuf, 0, MEM_RELEASE ); VirtualFree( rbuf1, 0, MEM_RELEASE ); + VirtualFree( rbuf2, 0, MEM_RELEASE ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 12b1d0f6c5..6c3b571638 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1070,11 +1070,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap status = FILE_GetNtStatus(); break; } - if (!result) - { - status = STATUS_END_OF_FILE; - break; - } + if (!result) break; total += result; length -= result; if ((pos += result) == page_size) @@ -1084,6 +1080,8 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap } } + if (total == 0) status = STATUS_END_OF_FILE; + send_completion = cvalue != 0; error: -- 2.15.1

1 0

[PATCH] readme: Move WineHQ URLs to https in translations.
by Lauri Kenttä 05 Dec '17

05 Dec '17

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- documentation/README.de | 24 ++++++++++++------------ documentation/README.es | 22 +++++++++++----------- documentation/README.fi | 20 ++++++++++---------- documentation/README.fr | 24 ++++++++++++------------ documentation/README.hu | 14 +++++++------- documentation/README.it | 24 ++++++++++++------------ documentation/README.ja | 20 ++++++++++---------- documentation/README.ko | 16 ++++++++-------- documentation/README.no | 24 ++++++++++++------------ documentation/README.pt | 12 ++++++------ documentation/README.pt_br | 24 ++++++++++++------------ documentation/README.ru | 20 ++++++++++---------- documentation/README.tr | 22 +++++++++++----------- documentation/README.uk | 24 ++++++++++++------------ documentation/README.zh_cn | 24 ++++++++++++------------ 15 files changed, 157 insertions(+), 157 deletions(-) diff --git a/documentation/README.de b/documentation/README.de index 5f450d12aa..2066bdfd04 100644 --- a/documentation/README.de +++ b/documentation/README.de @@ -24,7 +24,7 @@ make Starten Sie Programme mit "wine Programmname". Weitere Informationen und Problemlösungen entnehmen Sie bitte dem Rest dieser Datei, der Man-Page von Wine und insbesondere der Vielzahl an -Informationen, die Sie auf http://www.winehq.org finden. +Informationen, die Sie auf https://www.winehq.org finden. 3. VORAUSSETZUNGEN @@ -45,7 +45,7 @@ Umständen in der Zukunft unterstützt. FreeBSD-Info: Wine wird generell nicht korrekt unter FreeBSD vor 8.0 funktionieren. Für - weitere Informationen überprüfen Sie auch http://wiki.freebsd.org/Wine + weitere Informationen überprüfen Sie auch https://wiki.freebsd.org/Wine Solaris-Info: Höchstwahrscheinlich werden Sie Wine mit der GNU-Toolchain (gcc, gas etc.) @@ -81,13 +81,13 @@ Optionale Bibliotheken: Der Configure-Aufruf zeigt am Ende optionale Bibliotheken an, die von Wine benutzt werden können, aber auf Ihrem System nicht gefunden wurden. Tipps zum Installieren fehlender Pakete finden Sie unter: - http://wiki.winehq.org/Recommended_Packages + https://wiki.winehq.org/Recommended_Packages Unter 64-Bit Plattformen, falls Sie Wine als 32-Bit kompilieren (Standard), benötigen Sie die 32-Bit-Versionen dieser Bibliotheken; Details unter - http://wiki.winehq.org/WineOn64bit + https://wiki.winehq.org/WineOn64bit Für ein reines 64-Bit Wine (oder ein gemischtes 32- und 64-Bit Wine-Setup), - siehe http://wiki.winehq.org/Wine64 + siehe https://wiki.winehq.org/Wine64 4. KOMPILIEREN @@ -116,7 +116,7 @@ der neuen in Konflikt stehen könnten. Versuchen Sie entweder "dpkg -r wine", "rpm -e wine" oder "make uninstall" vor der Installation auszuführen. Nach der Installation können Sie das Tool "winecfg" starten. -Konfigurationshinweise finden Sie im Support-Bereich auf http://www.winehq.org/ +Konfigurationshinweise finden Sie im Support-Bereich auf https://www.winehq.org/ 6. AUSFÜHREN VON PROGRAMMEN @@ -143,19 +143,19 @@ wenn Sie den Fehler melden. 7. WEITERFÜHRENDE INFORMATIONEN WWW: Eine große Menge an Informationen findet sich im WineHQ unter - http://www.winehq.org/ : Verschiedene Wine Guides, + https://www.winehq.org/ : Verschiedene Wine Guides, Applikations-Datenbank, Bugtracker. Das ist vermutlich der beste Ausgangspunkt. -FAQ: Die FAQ zu Wine befindet sich unter http://www.winehq.org/FAQ +FAQ: Die FAQ zu Wine befindet sich unter https://www.winehq.org/FAQ -Wiki: Das Wine-Wiki finden Sie unter http://wiki.winehq.org +Wiki: Das Wine-Wiki finden Sie unter https://wiki.winehq.org Mailing-Listen: Es gibt mehrere Mailing-Listen für Wine-Anwender und -Entwickler; - Schauen Sie sich dazu bitte http://www.winehq.org/forums an. + Schauen Sie sich dazu bitte https://www.winehq.org/forums an. -Fehler: Melden Sie Fehler bitte an Wine-Bugzilla unter http://bugs.winehq.org +Fehler: Melden Sie Fehler bitte an Wine-Bugzilla unter https://bugs.winehq.org Schauen Sie bitte erst in der Bugzilla-Datenbank nach, ob Ihr Problem bereits bekannt ist oder sogar behoben wurde, bevor Sie eine Fehlermeldung verfassen. @@ -163,7 +163,7 @@ Fehler: Melden Sie Fehler bitte an Wine-Bugzilla unter http://bugs.winehq.org IRC: Online-Hilfe ist im IRC-Kanal #WineHQ unter irc.freenode.net verfügbar. Git: Der aktuelle Wine-Entwicklungsstand ist über Git verfügbar. - Besuchen Sie http://www.winehq.org/git für weitere Informationen. + Besuchen Sie https://www.winehq.org/git für weitere Informationen. Wenn Sie etwas hinzufügen oder einen Fehler beheben, senden Sie bitte einen Patch (vorzugsweise mit git-format-patch) an die Liste wine-devel(a)winehq.org, diff --git a/documentation/README.es b/documentation/README.es index 08169115d9..8068217ebc 100644 --- a/documentation/README.es +++ b/documentation/README.es @@ -22,7 +22,7 @@ Wine para compilar e instalar Wine. Desde el directorio base del código de Wine Ejecute aplicaciones con "wine programa". Para más información y resolución de problemas, continúe leyendo este archivo, la página man de Wine, o más específicamente, la numerosa información que puede encontrar en -http://www.winehq.org. +https://www.winehq.org. 3. REQUISITOS @@ -42,7 +42,7 @@ podrían obtener soporte en el futuro. Información sobre FreeBSD: Por lo general Wine no funcionará correctamente en versiones anteriores a - FreeBSD 8.0. Visite http://wiki.freebsd.org/Wine para más información. + FreeBSD 8.0. Visite https://wiki.freebsd.org/Wine para más información. Información sobre Solaris: Lo más probable es que necesite compilar con el conjunto de herramientas GNU @@ -77,14 +77,14 @@ Requisitos básicos: Librerías de soporte adicionales: Configure mostrará advertencias cuando las librerías opcionales no se encuentren disponibles en su sistema. - Visite http://wiki.winehq.org/Recommended_Packages para recomendaciones + Visite https://wiki.winehq.org/Recommended_Packages para recomendaciones acerca de que paquetes debe instalar. En plataformas de 64-bit, si se está compilando Wine 32-bits (es la compilación por defecto), debe estar seguro de tener instaladas las librerías - de desarrollo de 32-bits; visite http://wiki.winehq.org/WineOn64bit para más + de desarrollo de 32-bits; visite https://wiki.winehq.org/WineOn64bit para más detalles. Si usted desea un entorno Wine 64-bits puro (o una mezcla de 32-bits - y 64-bits), vaya a http://wiki.winehq.org/Wine64 para más detalles. + y 64-bits), vaya a https://wiki.winehq.org/Wine64 para más detalles. 4. COMPILACIÓN @@ -114,7 +114,7 @@ crear conflictos. Realice un "dpkg -r wine" o "rpm -e wine" o "make uninstall" antes de instalar. Una vez instalado, puede ejecutar la herramienta de configuración "winecfg". -Visite la zona de Soporte en http://www.winehq.org/ para consejos sobre la +Visite la zona de Soporte en https://www.winehq.org/ para consejos sobre la configuración. @@ -144,18 +144,18 @@ recibirá un log de error que debe adjuntar en caso de reportar un fallo. 7. OBTENIENDO MÁS INFORMACIÓN WWW: Una gran cantidad de información sobre Wine está disponible en WineHQ - en http://www.winehq.org/ : varias guías de Wine, base de datos de + en https://www.winehq.org/ : varias guías de Wine, base de datos de aplicaciones, registro de bugs. Este es probablemente el mejor punto de partida. FAQ: Las preguntas frecuentes de Wine se encuentran en - http://www.winehq.org/FAQ + https://www.winehq.org/FAQ Listas de correo: Hay varias listas de correo, tanto para usuarios como desarrolladores; - Vaya a http://www.winehq.org/forums para más información. + Vaya a https://www.winehq.org/forums para más información. -Bugs: Reporte fallos en el Bugzilla de Wine, http://bugs.winehq.org +Bugs: Reporte fallos en el Bugzilla de Wine, https://bugs.winehq.org Por favor, antes de enviar un informe de fallo busque en la base de datos de bugzilla para comprobar si su problema es un fallo conocido o existe una solución. @@ -163,7 +163,7 @@ Bugs: Reporte fallos en el Bugzilla de Wine, http://bugs.winehq.org IRC: Se puede obtener ayuda online en el canal #WineHQ de irc.freenode.net. Git: El árbol actual de desarrollo de Wine está disponible a través de Git. - Vaya a http://www.winehq.org/git para más información. + Vaya a https://www.winehq.org/git para más información. Si añade algo, o corrige algún bug, por favor envíe un parche (en formato git-format-patch) a la lista wine-devel(a)winehq.org para su inclusión diff --git a/documentation/README.fi b/documentation/README.fi index ae167ee800..30311d8280 100644 --- a/documentation/README.fi +++ b/documentation/README.fi @@ -28,7 +28,7 @@ Tai aja se käännöshakemistosta: Ohjelmat ajetaan komennolla "wine ohjelma". Lisätietoja sekä apua ongelmien ratkaisemiseen on jäljempänä tässä tiedostossa, Winen man-sivuilla sekä -ennen kaikkea Internetissä osoitteessa http://www.winehq.org/. +ennen kaikkea Internetissä osoitteessa https://www.winehq.org/. 3. JÄRJESTELMÄVAATIMUKSET @@ -47,7 +47,7 @@ muillekin käyttöjärjestelmille, joissa on tarvittava tuki säikeille. Tietoa FreeBSD:lle: Pääsääntöisesti Wine ei toimi vanhemmilla versioilla kuin FreeBSD 8.0. - Osoitteessa http://wiki.freebsd.org/Wine kerrotaan tästä lisää. + Osoitteessa https://wiki.freebsd.org/Wine kerrotaan tästä lisää. Tietoa Solarikselle: Wine täytyy luultavasti kääntää GNU-työkaluilla (gcc, gas jne.). @@ -79,7 +79,7 @@ Perusvaatimukset: Valinnaisia tukikirjastoja: configure-skripti näyttää varoituksia, kun valinnaisia kirjastoja puuttuu. - Osoitteessa http://wiki.winehq.org/Recommended_Packages on tietoa, mitkä + Osoitteessa https://wiki.winehq.org/Recommended_Packages on tietoa, mitkä paketit ovat hyödyksi. 64-bittisissä järjestelmissä täytyy varmistaa, että kirjastoista on asennettu 32-bittiset versiot. @@ -111,7 +111,7 @@ Ennen asennusta pitää muistaa poistaa aiemmat Winen versiot. Poistamista voi yrittää komennolla "dpkg -r wine", "rpm -e wine" tai "make uninstall". Kun Wine on asennettu, voidaan ajaa asetusohjelma "winecfg". Sivustolla -http://www.winehq.org/ kohdassa Support on englanninkielisiä lisäohjeita. +https://www.winehq.org/ kohdassa Support on englanninkielisiä lisäohjeita. 6. OHJELMIEN AJAMINEN @@ -136,28 +136,28 @@ mukaan, jos raportoi virheestä. 7. LISÄTIETOJA -WWW: Winestä on paljon tietoa WineHQ:ssa, http://www.winehq.org/. +WWW: Winestä on paljon tietoa WineHQ:ssa, https://www.winehq.org/. Oppaita, ohjelmatietokanta sekä Bugzilla vikojen listaamiseen. Täältä kannattaa yleensä aloittaa. Kysymyksiä: - Sivulle http://www.winehq.org/FAQ on koottu kysymyksiä ja vastauksia. + Sivulle https://www.winehq.org/FAQ on koottu kysymyksiä ja vastauksia. -Wiki: Wine Wiki on osoitteessa http://wiki.winehq.org/. +Wiki: Wine Wiki on osoitteessa https://wiki.winehq.org/. Postituslistat: Winen käyttäjille ja kehittäjille on joitakin postituslistoja, - sivulla http://www.winehq.org/forums kerrotaan niistä lisää. + sivulla https://www.winehq.org/forums kerrotaan niistä lisää. Virheet: - Ilmoita virheistä Winen Bugzillaan, http://bugs.winehq.org/. + Ilmoita virheistä Winen Bugzillaan, https://bugs.winehq.org/. Katso kuitenkin ensin Bugzilla-tietokannasta, onko samasta asiasta ilmoitettu jo aiemmin. IRC: Online-apua voi saada kanavalta #WineHQ palvelimella irc.freenode.net. Git: Winen tämänhetkinen kehitysversio on jaossa Git-järjestelmän kautta. - Sivulla http://www.winehq.org/git kerrotaan tästä lisää. + Sivulla https://www.winehq.org/git kerrotaan tästä lisää. Jos lisäät jotain tai korjaat jonkin virheen, lähetä toki muutoksesi diff --git a/documentation/README.fr b/documentation/README.fr index d42d20a02c..28729a5b41 100644 --- a/documentation/README.fr +++ b/documentation/README.fr @@ -23,7 +23,7 @@ make Pour exécuter un programme, tapez « wine programme ». Pour des informations complémentaires et la résolutions de problèmes, lisez la suite de ce fichier, les pages de manuel de Wine, et surtout les nombreuses -informations que vous trouverez sur http://www.winehq.org. +informations que vous trouverez sur https://www.winehq.org. 3. CONFIGURATION NÉCESSAIRE @@ -45,7 +45,7 @@ futur. Informations FreeBSD : Wine ne fonctionnera généralement pas bien avec les versions FreeBSD - antérieures à 8.0. Voyez http://wiki.freebsd.org/Wine pour plus + antérieures à 8.0. Voyez https://wiki.freebsd.org/Wine pour plus d'informations. Informations Solaris : @@ -85,14 +85,14 @@ Configuration de base requise : Bibliothèques optionnelles : « configure » affiche des messages quand des bibliothèques optionnelles ne sont pas détectées sur votre système. - Consultez http://wiki.winehq.org/Recommended_Packages (en anglais) pour + Consultez https://wiki.winehq.org/Recommended_Packages (en anglais) pour des indications sur les paquets logiciels que vous devriez installer. Sur les plates-formes 64 bits, si vous compilez Wine pour le mode 32 bits (mode par défaut), les versions 32 bits de ces bibliothèques doivent être - installées. Voyez http://wiki.winehq.org/WineOn64bit pour les détails. + installées. Voyez https://wiki.winehq.org/WineOn64bit pour les détails. Si vous désirez un Wine 64 bits pur (ou une configuration mixte - 32/64 bits), consultez http://wiki.winehq.org/Wine64. + 32/64 bits), consultez https://wiki.winehq.org/Wine64. 4. COMPILATION @@ -125,7 +125,7 @@ d'installer une nouvelle version. Une fois l'installation terminée, vous pouvez lancer l'outil de configuration « winecfg ». Consultez la section Support de -http://www.winehq.org/ pour obtenir des astuces de configuration. +https://www.winehq.org/ pour obtenir des astuces de configuration. 6. EXÉCUTER DES PROGRAMMES @@ -156,22 +156,22 @@ d'attacher à un éventuel rapport de bogue. 7. SOURCES D'INFORMATIONS COMPLÉMENTAIRES WWW : Beaucoup d'informations à propos de Wine sont disponibles sur - WineHQ (http://www.winehq.org) : divers guides, base de données + WineHQ (https://www.winehq.org) : divers guides, base de données d'applications, suivi de bogues. C'est probablement le meilleur point de départ. FAQ : La Foire aux Questions de Wine se trouve sur - http://www.winehq.org/FAQ + https://www.winehq.org/FAQ -Wiki : Le wiki Wine est situé sur http://wiki.winehq.org +Wiki : Le wiki Wine est situé sur https://wiki.winehq.org Listes de diffusion : Il existe plusieurs listes de diffusion pour les utilisateurs et - les développeurs Wine ; voyez http://www.winehq.org/forums pour de + les développeurs Wine ; voyez https://www.winehq.org/forums pour de plus amples informations. Bogues : - Signalez les bogues sur le Bugzilla Wine à http://bugs.winehq.org + Signalez les bogues sur le Bugzilla Wine à https://bugs.winehq.org Merci de vérifier au préalable dans la base de données de bugzilla que le problème n'est pas déjà connu, ou corrigé. @@ -179,7 +179,7 @@ IRC : L'aide en ligne est disponible via le canal #WineHQ sur irc.freenode.net. Git : L'arbre de développement actuel de Wine est disponible via Git. - Voyez http://www.winehq.org/git pour plus d'informations. + Voyez https://www.winehq.org/git pour plus d'informations. Si vous ajoutez quelque chose ou corrigez un bogue, merci d'envoyer un correctif (de préférence en utilisant git-format-patch) à la liste de diff --git a/documentation/README.hu b/documentation/README.hu index d3fee99401..bee730d79d 100644 --- a/documentation/README.hu +++ b/documentation/README.hu @@ -23,7 +23,7 @@ k A programok futtat�sa "wine [opci�k] program". A tov�bbi inform�ci�khoz �s a probl�ma felvil�gos�t�shoz olvassa el ennek a f�jlnak a tov�bbi r�sz�t, a Wine man oldal�t, �s k�l�n�sen gazdag inform�ci� tal�lhat� itt: -http://www.winehq.org. +https://www.winehq.org. 3. K�VETELM�NYEK @@ -130,7 +130,7 @@ El Pr�b�lja ki a "dpkg -r wine", �s az "rpm -e wine", vagy a "make uninstall" parancsot telep�t�s el�tt. -L�togassa meg a t�mogat�si oldalt itt: http://www.winehq.org/ a konfigur�ci�s +L�togassa meg a t�mogat�si oldalt itt: https://www.winehq.org/ a konfigur�ci�s tippekhez. F�ggv�nyk�nyvt�r bet�lt�si hib�k eset�n @@ -176,16 +176,16 @@ http://home.nexgo.de/andi.mohr/download/decorrupt_explorer 7. T�BB INFORM�CI� BESZERZ�SE WWW: A Wine-r�l hatalmas mennyis�g� inform�ci� �rhet� el a WineHQ-n ezen - a c�men: http://www.winehq.org/ : k�l�nb�z� Wine �tmutat�k, + a c�men: https://www.winehq.org/ : k�l�nb�z� Wine �tmutat�k, alkalmaz�s adatb�zis, �s hibak�vet�s. Ez tal�n a legjobb kiindul�si pont. -GYIK: A Wine GYIK itt tal�lhat�: http://www.winehq.org/FAQ +GYIK: A Wine GYIK itt tal�lhat�: https://www.winehq.org/FAQ Usenet: T�rsaloghat a Wine-hoz kapcsol�d� t�m�kban, �s seg�ts�get k�rhet itt: comp.emulators.ms-windows.wine. -Hib�k: Wine hibabejelent�s a Bugzilla-n kereszt�l itt: http://bugs.winehq.org +Hib�k: Wine hibabejelent�s a Bugzilla-n kereszt�l itt: https://bugs.winehq.org K�rem hibabejelent�s k�ld�se el�tt ellen�rizze, hogy az �n probl�m�ja m�r megtal�lhat�-e az adatb�zisban. K�ldhet hibabejelent�seket a comp.emulators.ms-windows.wine c�mre is. @@ -193,11 +193,11 @@ Hib IRC: Azonnali seg�ts�g el�rhet� a #WineHQ csatorn�n a irc.freenode.net-en. Git: A jelenlegi Wine fejleszt�i fa el�rhet� Git-en kereszt�l. - L�togasson el ide a tov�bbi inform�ci�hoz: http://www.winehq.org/git + L�togasson el ide a tov�bbi inform�ci�hoz: https://www.winehq.org/git Levelez�list�k: El�rhet� n�h�ny levelez�lista a Wine fejleszt�k sz�m�ra; n�zze meg a - http://www.winehq.org/forums c�met a tov�bbi inform�ci�hoz. + https://www.winehq.org/forums c�met a tov�bbi inform�ci�hoz. Ha valamit hozz�ad, vagy hib�t jav�t, k�rem k�ldj�n jav�t�foltot ('diff -u' form�tumban) a wine-devel(a)winehq.org levelez�lista c�mre, hogy beletehess�k a diff --git a/documentation/README.it b/documentation/README.it index 0c2bcd8511..ecb4aed75e 100644 --- a/documentation/README.it +++ b/documentation/README.it @@ -23,7 +23,7 @@ Wine, eseguire: Eseguire i programmi com "wine programma". Per maggiori informazioni e risoluzioni di problemi, leggere il resto di questo file, la pagina man di Wine, ed in modo particolare la notevole quantità di informazioni che -si trova all'indirizzo http://www.winehq.org. +si trova all'indirizzo https://www.winehq.org. 3. REQUISITI @@ -43,7 +43,7 @@ che forniscono kernel threads potrebbero essere supportati in futuro. Informazioni per FreeBSD: In generale Wine non funzionerà correttamente con versioni precedenti a FreeBSD 8.0. - Leggere http://wiki.freebsd.org/Wine per maggiori informazioni. + Leggere https://wiki.freebsd.org/Wine per maggiori informazioni. Informazioni per Solaris: Sarà molto probabilmente necessario compilare Wine con i tool GNU @@ -76,14 +76,14 @@ Requisiti basilari: Librerie opzionali di supporto: Configure notificherà a video quando le librerie opzionali non sono - trovate sul sistema. Leggere http://wiki.winehq.org/Recommended_Packages + trovate sul sistema. Leggere https://wiki.winehq.org/Recommended_Packages per suggerimenti sui pacchetti da installare. Su piattaforme a 64-bit, per compilare Wine a 32-bit (predefinito), assicurarsi di installare la versione a 32-bit di queste librerie; - leggere http://wiki.winehq.org/WineOn64bit per i dettagli. Per avere + leggere https://wiki.winehq.org/WineOn64bit per i dettagli. Per avere Wine solo 64-bit (o un setup di Wine misto tra 32-bit e 64-bit), - leggere http://wiki.winehq.org/Wine64 per maggiori informazioni. + leggere https://wiki.winehq.org/Wine64 per maggiori informazioni. 4. COMPILAZIONE @@ -114,7 +114,7 @@ di Wine in conflitto. Prova sia "dpkg -r wine" o "rpm -e wine" o "make uninstall" prima di installare. Una volta installato, esegui lo strumento di configurazione "winecfg". -Leggi l'area Support su http://www.winehq.org/ per suggerimenti sulla +Leggi l'area Support su https://www.winehq.org/ per suggerimenti sulla configurazione. @@ -142,19 +142,19 @@ di segnalazione del problema. 7. PER OTTENERE PIÙ INFORMAZIONI WWW: Un gran quantitativo di informazioni su Wine è disponibile al - WineHQ, http://www.winehq.org/: varie guide su Wine, database + WineHQ, https://www.winehq.org/: varie guide su Wine, database delle applicazioni, rintracciamento di bug. Questo è probabilmente il miglior punto di partenza. -FAQ: Le FAQ di Wine si trovano all'indirizzo http://www.winehq.org/FAQ +FAQ: Le FAQ di Wine si trovano all'indirizzo https://www.winehq.org/FAQ -Wiki: Il Wiki di Wine si trova all'indirizzo http://wiki.winehq.org +Wiki: Il Wiki di Wine si trova all'indirizzo https://wiki.winehq.org Mailing list: Esistono diverse mailing list per utenti e sviluppatori di Wine; - visitare http://www.winehq.org/forums per ulteriori informazioni. + visitare https://www.winehq.org/forums per ulteriori informazioni. -Bugs: Segnalare i bug su Wine Bugzilla all'indirizzo http://bugs.winehq.org +Bugs: Segnalare i bug su Wine Bugzilla all'indirizzo https://bugs.winehq.org Si prega di controllare il database di Bugzilla per verificare che il problema non sia già conosciuto o risolto prima di creare un rapporto su di esso. @@ -162,7 +162,7 @@ Bugs: Segnalare i bug su Wine Bugzilla all'indirizzo http://bugs.winehq.org IRC: Aiuto online disponibile nel canale #WineHQ su irc.freenode.net. Git: L'albero attuale di sviluppo di Wine è disponibile attraverso Git. - Vedere http://www.winehq.org/git per maggiori informazioni. + Vedere https://www.winehq.org/git per maggiori informazioni. Se aggiungi qualcosa, o correggi un bug, si prega di mandare una patch (preferibilmente usando git-format-patch) alla mailing list diff --git a/documentation/README.ja b/documentation/README.ja index ae21f73dcd..9b44353306 100644 --- a/documentation/README.ja +++ b/documentation/README.ja @@ -21,7 +21,7 @@ make "wine program"のようにプログラムを実行してください。更なる情報や問題解決については、このファイルの残りの部分、Wineのmanページや、 -特にhttp://www.winehq.orgで見つかる豊富な情報を読んでください。 +特にhttps://www.winehq.orgで見つかる豊富な情報を読んでください。 3. 要件 @@ -41,7 +41,7 @@ Wineをコンパイルし実行するには、以下のうち一つを持って FreeBSD情報: Wineは一般的にFreeBSD 8.0より前のバージョン上で正しく動作しないでしょう。 - 詳細については http://wiki.freebsd.org/Wine を参照してください。 + 詳細については https://wiki.freebsd.org/Wine を参照してください。 Solaris情報: GNUツールチェーン（gcc、gasなど）でWineをビルドする必要がある可能性が @@ -77,7 +77,7 @@ Mac OS X情報: オプションのサポートライブラリ: configureはオプションのライブラリがシステム上に見つからなかったときに通知を表示します。インストールすべきパッケージについてのヒントについては - http://wiki.winehq.org/Recommended_Packagesを参照してください。64ビットプ + https://wiki.winehq.org/Recommended_Packagesを参照してください。64ビットプラットフォームでは、これらライブラリの32ビットバージョンをインストールしたことをよく確認してください。 @@ -110,7 +110,7 @@ make または"make uninstall"を試してください。いったんインストールされると、"winecfg"設定ツールを実行できます。 -設定のヒントについてはhttp://www.winehq.org/におけるサポート領域を +設定のヒントについてはhttps://www.winehq.org/におけるサポート領域を参照してください。 @@ -137,26 +137,26 @@ Wineは完璧ではないので、いくつかのプログラムはクラッシ 7. 更なる情報の取得 -WWW: Wineについてのたくさんの情報がhttp://www.winehq.org/にある +WWW: Wineについてのたくさんの情報がhttps://www.winehq.org/にある WineHQから入手できます。多様なWineガイド、アプリケーションデータベース、バグ追跡。これはおそらく最良の出発点です。 -FAQ: Wine FAQはhttp://www.winehq.org/FAQにあります +FAQ: Wine FAQはhttps://www.winehq.org/FAQにあります -Wiki: Wine Wikiはhttp://wiki.winehq.orgにあります +Wiki: Wine Wikiはhttps://wiki.winehq.orgにありますメーリングリスト: Wineユーザと開発者のためのいくつかのメーリングリストがあります。 - 詳細についてはhttp://www.winehq.org/forumsを参照してください。 + 詳細についてはhttps://www.winehq.org/forumsを参照してください。 -バグ: http://bugs.winehq.orgにあるWine Bugzillaでバグを報告してください。 +バグ: https://bugs.winehq.orgにあるWine Bugzillaでバグを報告してください。バグ報告を投稿する前に問題が既知や修正済みかどうかを調べるために bugzillaデータベースを検索してください。 IRC: irc.freenode.net上のチャンネル#WineHQでオンラインヘルプを利用できます。 Git: 現在のWine開発ツリーはGitを通して入手できます。 - 詳細についてはhttp://www.winehq.org/gitに行ってください。 + 詳細についてはhttps://www.winehq.org/gitに行ってください。何かを追加するか、バグを修正するならば、次のリリースに含めるためにパッチ（git-format-patchをなるべく使用）をwine-devel(a)winehq.xn--org-eb4bpa2au41dheqot743g diff --git a/documentation/README.ko b/documentation/README.ko index 4686ad8eee..59debaa9ed 100644 --- a/documentation/README.ko +++ b/documentation/README.ko @@ -20,7 +20,7 @@ LICENSE ��α׷�� "wine ��α׷��"ó�� մϴ�. �� ڼ�� ذ� �� κа� Wine �� Ͻʽÿ�. -Ư�� http://www.winehq.org ��Ʈ�� Ǿ� �ֽ��ϴ�. +Ư�� https://www.winehq.org ��Ʈ�� Ǿ� �ֽ��ϴ�. 3. ��忡 �ʿ�� @@ -126,7 +126,7 @@ Wine �ٶ��ϴ�. "dpkg -r wine" �Ǵ� "rpm -e wine" �Ǵ� "make uninstall" �� ֽ��ϴ�. -�� http://www.winehq.org/�� Support �� ֽ��ϴ�. +�� https://www.winehq.org/�� Support �� ֽ��ϴ�. ��̺귯�� ε� ��("Error while loading shared libraries: libntdll.so")�� ߻��ϴ� �� ̺귯�� ΰ� /etc/ld.so.conf �� ȿ� ��Ǿ� �ִ�� @@ -159,15 +159,15 @@ Wine 7. �� ڼ�� WWW: �� Wine ��̵�, ��ø��̼� ��ͺ��̽�, �� - http://www.winehq.org/ �� ִ� WineHQ ��Ʈ�� + https://www.winehq.org/ �� ִ� WineHQ ��Ʈ�� ֽ��ϴ�. �� ã�� 밳 �� Ʈ�� ˴ϴ�. -FAQ: Wine FAQ�� http://www.winehq.org/FAQ �� ֽ��ϴ�. +FAQ: Wine FAQ�� https://www.winehq.org/FAQ �� ֽ��ϴ�. Usenet: Wine �� ϰų� �� comp.emulators.ms-windows.wine �׷�� ̿��ϱ� �ٶ��ϴ�. -Bugs: http://bugs.winehq.org �� Wine Bugzilla�� ׸� ��Ͻʽÿ�. +Bugs: https://bugs.winehq.org �� Wine Bugzilla�� ׸� ��Ͻʽÿ�. �� ϱ� �� ̹� �� ִ�� ͺ��̽� �˻�� Ȯ��ϱ� �ٶ��ϴ�. comp.emulators.ms-windows.wine �׷쿡 �� ÷�� ˴ϴ�. @@ -175,13 +175,13 @@ Bugs: http://bugs.winehq.org IRC: irc.freenode.net �� #WineHQ ä�ο�� ֽ��ϴ�. GIT: Wine �� Ʈ�� GIT�� ǰ� �ֽ��ϴ�. �� ڼ�� - http://www.winehq.org/site/git �� ϱ� �ٶ��ϴ�. + https://www.winehq.org/site/git �� ϱ� �ٶ��ϴ�. ��ϸ� ��Ʈ: Wine ��ڿ� ��ڸ� �� ϸ� ��Ʈ�� �ǰ� �ֽ��ϴ�. - �� ڼ�� http://www.winehq.org/forums �� ϱ� �ٶ��ϴ�. + �� ڼ�� https://www.winehq.org/forums �� ϱ� �ٶ��ϴ�. -��Ű: Wine ��Ű�� http://wiki.winehq.org �� ֽ��ϴ�. +��Ű: Wine ��Ű�� https://wiki.winehq.org �� ֽ��ϴ�. �߰�� ̳� �� װ� �ִٸ� �� Ե� �� ֵ�� wine-devel(a)winehq.org ��ϸ� ��Ʈ�� ġ('diff -u' �� )�� diff --git a/documentation/README.no b/documentation/README.no index 5c42500045..443515e255 100644 --- a/documentation/README.no +++ b/documentation/README.no @@ -20,7 +20,7 @@ rotkatalogen til Wine-kildekoden ./tools/wineinstall Kjør programmer som «wine program». Se resten av denne filen, -Wines man-side og http://www.winehq.org/ for mer informasjon og +Wines man-side og https://www.winehq.org/ for mer informasjon og problemløsing. @@ -40,7 +40,7 @@ støtter kjernetråder støttes kanskje i framtiden. Informasjon for FreeBSD: Wine vil som regel ikke virke på FreeBSD-versjoner eldre enn 8.0. - Se <http://wiki.freebsd.org/Wine> for mer informasjon. + Se <https://wiki.freebsd.org/Wine> for mer informasjon. Informsjon for Solaris: Wine må antakelig bygges med GNU-verktøyene (gcc, gas etc.). @@ -72,15 +72,15 @@ Basiskrav: Valgfrie støttebiblioteker: configure-skriptet viser meldinger når valgfrie biblioteker ikke blir - funnet. Se http://wiki.winehq.org/Recommended_Packages for info om + funnet. Se https://wiki.winehq.org/Recommended_Packages for info om hvilke pakker du bør installere. På 64 bit-systemer trenger du 32 bit-versjoner av disse bibliotekene hvis du skal bygge Wine som et 32 bit-program (standard); - se http://wiki.winehq.org/WineOn64bit for flere detaljer. + se https://wiki.winehq.org/WineOn64bit for flere detaljer. Hvis du ønsker å bygge Wine som et 64 bit-program (eller et oppsett med blandet 32 bit og 64 bit) kan du lese mer på - http://wiki.winehq.org/Wine64 + https://wiki.winehq.org/Wine64 4. BYGGING @@ -105,7 +105,7 @@ Ikke glem å avinstallere tidligere Wine-versjoner først. Prøv enten «dpkg -r wine», «rpm -e wine» eller «make uninstall» før installsjonen. Når Wine er installert kan du bruke oppsettsverktøyet «winecfg». -Se støtteområdet på http://www.winehq.org/ for hint om oppsett. +Se støtteområdet på https://www.winehq.org/ for hint om oppsett. 6. KJØRING AV PROGRAMMER @@ -134,18 +134,18 @@ når du rapporterer en feil. 7. MER INFORMASJON Internett: En god del informasjon om Wine finnes hos WineHQ på - http://www.winehq.org/ : diverse veiledere, en programdatabase + https://www.winehq.org/ : diverse veiledere, en programdatabase og feilsporing. Dette er antakelig det beste stedet å begynnne. -Svar: Wines spørsmål og svar finnes på http://www.winehq.org/FAQ +Svar: Wines spørsmål og svar finnes på https://www.winehq.org/FAQ -Wiki: Wines Wiki er tilgjengelig på http://wiki.winehq.org +Wiki: Wines Wiki er tilgjengelig på https://wiki.winehq.org E-postlister: Det finnes flere e-postlister for Wine-utviklere og -brukere; - besøk http://www.winehq.org/forums for mer informasjon. + besøk https://www.winehq.org/forums for mer informasjon. -Feil: Rapporter feil til Wines Bugzilla på http://bugs.winehq.org +Feil: Rapporter feil til Wines Bugzilla på https://bugs.winehq.org Søk i Bugzilla-databasen og se om probelmet allerede er funnet før du sender en feilrapport. @@ -153,7 +153,7 @@ IRC: Nødhjelp er tilgjengelig på kanalen #WineHQ på irc.freenode.net. Git: Wines oppdaterte utvikler-versjon er tilgjengelig gjennom GIT. - Gå til http://www.winehq.org/git for mer informasjon. + Gå til https://www.winehq.org/git for mer informasjon. Hvis du legger til noe eller fikser en feil er det fint som du sender en oppdateringsfil (helst laget med git format-patch) til listen diff --git a/documentation/README.pt b/documentation/README.pt index b0914f2098..1083bda314 100644 --- a/documentation/README.pt +++ b/documentation/README.pt @@ -21,7 +21,7 @@ do Wine source (que cont Corre os programas conforme as "wine [options] program". Para mais informa��es e reso�u��o de problemas. L� o resto deste ficheiro, a Wine man page, e especialmente a abund�ncia de informa��o encontrada em -http://www.winehq.org. +https://www.winehq.org. 3.REQUERIMENTOS @@ -130,7 +130,7 @@ instala Tenta outro "dpkg -r wine" ou "rpm -e wine" ou "make uninstall" antes de installar. -Ver http://www.winehq.org/support/ para informa��o sobre a +Ver https://www.winehq.org/support/ para informa��o sobre a configura�ao. No caso da livraria carregar erros (e.g. "Error while loading shared @@ -185,11 +185,11 @@ http://home.nexgo.de/andi.mohr/download/decorrupt_explorer 7.ARRANJAR MAIS INFORMA��O www: Uma grande quantidade de informa��o acerca do Wine est� disponivel - pelo WineHQ em http://www.winehq.org/ : varios guias Wine, base de + pelo WineHQ em https://www.winehq.org/ : varios guias Wine, base de dados de aplica��es, localiza�ao de erros. Isto � provavelmente o melhor ponto de come�o. -FAQ: A Wine FAQ est� localizada em http://www.winehq.org/FAQ +FAQ: A Wine FAQ est� localizada em https://www.winehq.org/FAQ Usenet: Tu podes discutor t�picos relacionados de Wine e obter ajuda em comp.emulators.ms-windows.wine. @@ -198,11 +198,11 @@ IRC: Ajuda online est Git: O currente desenvolvimento do Wine est� disponivel por Git. - Vai a http://www.winehq.org/git para mais informa��o. + Vai a https://www.winehq.org/git para mais informa��o. Mailing Lists: H� algumas mailing list para responsaveis pelo desenvolvimento Wine; ver em - http://www.winehq.org/forums para mais informa��o. + https://www.winehq.org/forums para mais informa��o. Se tu acrescentaste algo,ou corrigiste um bug, por favor envia um patch (em 'diff -u' format) para wine-devel(a)winehq.org lista para inclus�o diff --git a/documentation/README.pt_br b/documentation/README.pt_br index a2cccac88e..3d221a5632 100644 --- a/documentation/README.pt_br +++ b/documentation/README.pt_br @@ -23,7 +23,7 @@ n Execute programas conforme "wine programa". Para maiores informa��es e resolu��o de problemas, leia o restante deste arquivo, a p�gina "man" do Wine (man wine), e especialmente a abund�ncia de informa��o -encontrada em http://www.winehq.org. +encontrada em https://www.winehq.org. 3. REQUERIMENTOS @@ -43,7 +43,7 @@ ter suporte no futuro. Informa��es para o FreeBSD: O Wine em geral n�o deve funcionar corretamente em vers�es antes da 8.0. - Veja http://wiki.freebsd.org/Wine para mais informa��es. + Veja https://wiki.freebsd.org/Wine para mais informa��es. Informa��es para o Solaris: Voc� provavelmente necessitar� construir o Wine com as ferramentas GNU @@ -77,14 +77,14 @@ Requisitos b Bibliotecas de suporte opcionais: O script configure ir� mostrar diversas mensagens quando bibliotecas opcionais n�o forem encontradas no seu sistema. - Veja http://wiki.winehq.org/Recommended_Packages para dicas sobre + Veja https://wiki.winehq.org/Recommended_Packages para dicas sobre pacotes que voc� pode instalar. Em plataformas de 64 bits, se compilar Wine como 32 bits (padr�o), voc� precisa assegurar que as vers�es 32 bits das bibliotecas est�o instaladas, - veja http://wiki.winehq.org/WineOn64bit para mais detalhes. + veja https://wiki.winehq.org/WineOn64bit para mais detalhes. Se voc� quer um verdadeiro Wine de 64 bits (ou uma configura��o mista de - 32 e 64 bits) veja http://wiki.winehq.org/Wine64 para mais detalhes. + 32 e 64 bits) veja https://wiki.winehq.org/Wine64 para mais detalhes. 4. COMPILA��O @@ -114,7 +114,7 @@ Wine que possa ser conflitante. Tente tanto "dpkg -r wine", "rpm -e wine" ou "make uninstall" antes de instalar. Depois de instalado, pode-se executar o programa de configura��o "winecfg". -Veja a �rea de suporte em http://www.winehq.org/ para dicas de configura��o. +Veja a �rea de suporte em https://www.winehq.org/ para dicas de configura��o. 6. EXECUTANDO PROGRAMAS @@ -142,20 +142,20 @@ poder 7. OBTENDO MAIS INFORMA��O WWW: Uma grande quantidade de informa��o sobre o Wine est� dispon�vel - no WineHQ em http://www.winehq.org/ : v�rios guias do Wine, base + no WineHQ em https://www.winehq.org/ : v�rios guias do Wine, base de dados de aplica��es, rastreamento de erros. Este � provavelmente o melhor ponto para come�ar. -FAQ: O FAQ (perguntas frequentes) do Wine est� em http://www.winehq.org/FAQ +FAQ: O FAQ (perguntas frequentes) do Wine est� em https://www.winehq.org/FAQ -Wiki: O wiki do Wine est� dispon�vel em http://wiki.winehq.org +Wiki: O wiki do Wine est� dispon�vel em https://wiki.winehq.org Listas de discuss�o: H� diversas listas de mensagens para usu�rios e colaboradores no - desenvolvimento do Wine; veja http://www.winehq.org/forums para + desenvolvimento do Wine; veja https://www.winehq.org/forums para mais informa��o. -Bugs: Relate erros ao Bugzilla do Wine em http://bugs.winehq.org +Bugs: Relate erros ao Bugzilla do Wine em https://bugs.winehq.org Por favor, pesquise a base de dados do bugzilla para verificar se seu problema j� foi encontrado ou resolvido antes de enviar um relat�rio do erro. @@ -163,7 +163,7 @@ Bugs: Relate erros ao Bugzilla do Wine em http://bugs.winehq.org IRC: A ajuda online est� dispon�vel em #WineHQ em irc.freenode.net. Git: A �rvore de desenvolvimento atual do Wine est� dispon�vel por Git. - Visite http://www.winehq.org/git para mais informa��o. + Visite https://www.winehq.org/git para mais informa��o. Se voc� alterar algo ou reparar um erro, envie, por favor, um patch (preferencialmente usando git-format-patch) � lista wine-devel(a)winehq.org diff --git a/documentation/README.ru b/documentation/README.ru index 5c068cc6ff..5276b99bd9 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -20,7 +20,7 @@ make Запустите программу с помощью команды «wine имя_программы». Источники дополнительной информации перечислены в конце этого файла. Ознакомьтесь с -руководством по Wine, а также с сайтом http://www.winehq.org. +руководством по Wine, а также с сайтом https://www.winehq.org. 3. ТРЕБОВАНИЯ @@ -40,7 +40,7 @@ make FreeBSD: Wine не будет работать как следует на версиях ниже, чем FreeBSD 8.0. - Посетите <http://wiki.freebsd.org/Wine> для дополнительной информации. + Посетите <https://wiki.freebsd.org/Wine> для дополнительной информации. Solaris: Лучше всего компоновать Wine инструментами GNU @@ -74,7 +74,7 @@ Mac OS X: Дополнительные библиотеки: Конфигурационный скрипт выведет список дополнительных библиотек, которые не были найдены в вашей системе. Ознакомьтесь с перечнем необходимых пакетов по адресу - http://wiki.winehq.org/Recommended_Packages. При работе на 64-битных платформах + https://wiki.winehq.org/Recommended_Packages. При работе на 64-битных платформах убедитесь, что у вас установлены 32-битные версии этих библиотек. 4. КОМПИЛЯЦИЯ @@ -105,7 +105,7 @@ make Попробуйте «dpkg -r wine», «rpm -e wine» или «make uninstall» до установки. После установки запустите конфигурационную программу «winecfg». Посетите -Службу поддержки на http://www.winehq.org/, если возникнут вопросы по конфигурации. +Службу поддержки на https://www.winehq.org/, если возникнут вопросы по конфигурации. 6. ЗАПУСК ПРОГРАММ @@ -132,25 +132,25 @@ Wine не идеален, поэтом некоторые программы м 7. ПОЛУЧЕНИЕ ДОПОЛНИТЕЛЬНОЙ ИНФОРМАЦИИ WWW: Много информации о Wine доступно в WineHQ на - http://www.winehq.org/: различные руководства Wine, база данных приложений, + https://www.winehq.org/: различные руководства Wine, база данных приложений, база данных ошибок. Вероятно лучше всего начать с этого сайта. -FAQ: Wine FAQ расположен на http://www.winehq.org/FAQ +FAQ: Wine FAQ расположен на https://www.winehq.org/FAQ -Wiki: Wine Wiki расположен на http://wiki.winehq.org +Wiki: Wine Wiki расположен на https://wiki.winehq.org Рассылки: Имеется несколько рассылок для пользователей и разработчиков Wine, - обратитесь по адресу http://www.winehq.org/forums за дополнительной информацией. + обратитесь по адресу https://www.winehq.org/forums за дополнительной информацией. -Ошибки: Сообщайте об ошибках в Wine Bugzilla по адресу http://bugs.winehq.org +Ошибки: Сообщайте об ошибках в Wine Bugzilla по адресу https://bugs.winehq.org Прежде чем отправлять сообщение об ошибке проверьте, может эта ошибка уже известна или исправлена в последней версии Wine. IRC: Онлайн помощь доступна на канале #WineHQ на irc.freenode.net. Git: Текущие разработки Wine доступны через Git. - Смотрите http://www.winehq.org/site/git для дополнительной информации. + Смотрите https://www.winehq.org/site/git для дополнительной информации. Если вы что-то добавили или исправили ошибку, пожалуйста отправьте патч (предпочтительно сгенерированный с помощью git-format-patch) на wine-devel(a)winehq.org diff --git a/documentation/README.tr b/documentation/README.tr index f48422d2a2..28b17b8c37 100644 --- a/documentation/README.tr +++ b/documentation/README.tr @@ -21,7 +21,7 @@ Kur'u kullanmanız önerilir. Wine kaynak kodu içerisinde en üst dizine Programları "wine [seçenekler] program" şeklinde çalıştırabilirsiniz. Daha ayrıntılı bilgi ve sorun çözümü için, bu dosyanın geri kalanını, -Wine kullanım kılavuzunu ve özellikle http://www.winehq.org sitesindeki +Wine kullanım kılavuzunu ve özellikle https://www.winehq.org sitesindeki zengin bilgi arşivini tarayabilirsiniz. 3. GEREKSİNİMLER @@ -43,7 +43,7 @@ de gelecekte desteklenebilir. FreeBSD hakkında bilgi: Wine, FreeBSD 8.0'dan önceki sürümlerde genellikle düzgün çalışmaz. - Ayrıntılı bilgi için http://wiki.freebsd.org/Wine adresini ziyaret + Ayrıntılı bilgi için https://wiki.freebsd.org/Wine adresini ziyaret ediniz. Solaris hakkında bilgi: @@ -78,13 +78,13 @@ Temel gereksinimler: Seçeneğe bağlı destek kitaplıkları: Yapılandırılırken, eğer seçeneğe bağlı paketler bulunamadıysa, bildirim alacaksınız. Yüklemeniz gereken paketler hakkında ipuçları için, - http://wiki.winehq.org/Recommended_Packages adresini ziyaret ediniz. + https://wiki.winehq.org/Recommended_Packages adresini ziyaret ediniz. 64 bit üzerinde, eğer Wine'yi 32 bit (varsayılan) olarak derleyecekseniz, bazı kitaplıklarin 32 bit sürümlerinin yüklü olduğundan emin olunuz; - ayrıntılar için http://wiki.winehq.org/WineOn64bit adresini ziyaret + ayrıntılar için https://wiki.winehq.org/WineOn64bit adresini ziyaret ediniz. Eğer gerçek bir 64 bit Wine kurulumu (veya 32-64 bit karışık) - isterseniz, bilgi için http://wiki.winehq.org/Wine64 adresini ziyaret + isterseniz, bilgi için https://wiki.winehq.org/Wine64 adresini ziyaret ediniz. 4. DERLEME @@ -113,7 +113,7 @@ kılavuzunu ve gerekli birkaç dosyayı kuracaktır. uninstall" komutlarından birini deneyiniz. Yüklemeden sonra, "winecfg" yapılandıma aracını -çalıştırabilirsiniz. Yapılandırma ipuçları için http://www.winehq.org/ +çalıştırabilirsiniz. Yapılandırma ipuçları için https://www.winehq.org/ adresinde Destek bölümüne bakınız. 6. UYGULAMALARIN ÇALIŞTIRILMASI @@ -139,16 +139,16 @@ bildirirken eklemelisiniz. 7. DAHA FAZLA BİLGİYE ERİŞİM -WWW: Wine hakkında geniş bilgiyi WineHQ sitesine http://www.winehq.org/ +WWW: Wine hakkında geniş bilgiyi WineHQ sitesine https://www.winehq.org/ adresinden ulaşarak edinebilirsiniz: çeşitli Wine kılavuzları, uygulama veritabanı, hata izleme gibi. Burası muhtemelen en iyi başlangıç noktasıdır. SSS: Wine hakkında sıkça sorulan sorulara buradan ulaşabilirsiniz: - http://www.winehq.org/FAQ + https://www.winehq.org/FAQ Hatalar: - Karşılaştığınız hataları http://bugs.winehq.org adresinden Wine + Karşılaştığınız hataları https://bugs.winehq.org adresinden Wine Bugzilla ile bildirebilirsiniz. Lütfen bir hata bildirmeden önce hatanın önceden girilip girilmediğini öğrenmek için Bugzilla'da arama yapınız. @@ -157,11 +157,11 @@ IRC: irc.freenode.net sunucusundan #WineHQ kanalı ile çevrimiçi yardım alabilirsiniz. Git: Geçerli Wine geliştirme ağacına Git üzerinden erişim sağlanabilir. - Daha fazla bilgi için http://www.winehq.org/git adresine gidiniz. + Daha fazla bilgi için https://www.winehq.org/git adresine gidiniz. E-posta listeleri: Wine geliştiricileri için birtakım e-posta listeleri bulunmaktadır. - Daha fazla bilgi için http://www.winehq.org/forums adresine gidiniz. + Daha fazla bilgi için https://www.winehq.org/forums adresine gidiniz. Eğer bir şey eklemek veya hata düzeltmek istiyorsanız, lütfen sonraki sürümde yer alabilmesii için wine-devel(a)winehq.org e-posta listesine bir diff --git a/documentation/README.uk b/documentation/README.uk index f9a4fa4853..a70e4979f1 100644 --- a/documentation/README.uk +++ b/documentation/README.uk @@ -21,7 +21,7 @@ Wine Installer для компонування і встановлення Wine. Запустіть програму як "wine program". Додаткові джерела інформації перераховані в кінці цього файлу. Ознайомтеся з посібником з Wine, -а також з сайтом http://www.winehq.org. +а також з сайтом https://www.winehq.org. 3. ВИМОГИ @@ -46,7 +46,7 @@ Linux: FreeBSD: Wine не буде працювати як слід на версіях нижче, ніж FreeBSD 6.3 чи 7.0. Для FreeBSD 6.3 є патч, що дозволяє Wine запускатися. - Відвідайте http://wiki.freebsd.org/Wine для додаткової інформації. + Відвідайте https://wiki.freebsd.org/Wine для додаткової інформації. Solaris: Найкраще збирати Wine інструментами GNU (gcc, gas, тощо). Увага: @@ -79,13 +79,13 @@ Mac OS X: Додаткові бібліотеки підтримки: Конфігураційний скрипт виведе список додаткових бібліотек, які не були знайдені у вашій системі. Ознайомтеся з переліком потрібних пакетів за - адресою http://wiki.winehq.org/Recommended_Packages. + адресою https://wiki.winehq.org/Recommended_Packages. На 64-бітних платформах ви повинні переконатися, що у вас встановлені 32-бітні версії цих бібліотек; за більш детальною інформацією зверніться - до http://wiki.winehq.org/WineOn64bit. Якщо вам потрібен 64-бітний Wine + до https://wiki.winehq.org/WineOn64bit. Якщо вам потрібен 64-бітний Wine (чи змішаний 32-бітний та 64-бітний встановлювач Wine), дивіться - http://wiki.winehq.org/Wine64 за більш детальною інформацією. + https://wiki.winehq.org/Wine64 за більш детальною інформацією. 4. ЗБИРАННЯ @@ -113,7 +113,7 @@ make перед встановленням. Після встановлення запустіть конфігураційну програму "winecfg". Відвідайте Службу -підтримки на http://www.winehq.org/, якщо виникнуть питання щодо конфігурування. +підтримки на https://www.winehq.org/, якщо виникнуть питання щодо конфігурування. 6. ЗАПУСК ПРОГРАМ @@ -140,26 +140,26 @@ Wine знаходиться в процесі розробки, тому дея 7. ОТРИМАННЯ ДОДАТКОВОЇ ІНФОРМАЦІЇ WWW: Багато інформації про Wine є в WineHQ на - http://www.winehq.org/: різні керівництва Wine, база даних додатків, + https://www.winehq.org/: різні керівництва Wine, база даних додатків, база даних помилок. Ймовірно найкраще почати з цього сайту. -FAQ: Wine FAQ розташований на http://www.winehq.org/FAQ +FAQ: Wine FAQ розташований на https://www.winehq.org/FAQ -Wiki: Wine Wiki розташована на http://wiki.winehq.org +Wiki: Wine Wiki розташована на https://wiki.winehq.org Списки розсилання: Є кілька розсилок для користувачів і розробників Wine; - дивіться http://www.winehq.org/forums для додаткової інформації. + дивіться https://www.winehq.org/forums для додаткової інформації. Помилки(баги): - Повідомляйте про помилки у Wine Bugzilla на http://bugs.winehq.org + Повідомляйте про помилки у Wine Bugzilla на https://bugs.winehq.org Перш ніж відправляти повідомлення про помилку перевірте в базі, чи ця помилка вже виявлена. IRC: Онлайн допомога доступна на каналі #WineHQ на irc.freenode.net. Git: Поточне дерево розробки Wine доступне через Git. - Дивіться http://www.winehq.org/git за детальною інформацією. + Дивіться https://www.winehq.org/git за детальною інформацією. Якщо ви щось додали або виправили помилку, надішліть патч (найкраще використавши git-format-patch) на wine-devel(a)winehq.org для його diff --git a/documentation/README.zh_cn b/documentation/README.zh_cn index ce23c99b96..936172471b 100644 --- a/documentation/README.zh_cn +++ b/documentation/README.zh_cn @@ -21,7 +21,7 @@ Wine 是自由软件，在 GNU LGPL 协议下发布；请查看 LICENSE 文件运行程序时，请使用“wine [程序名]”的语法。如需了解更多信息或解决遇到的问题，您可以继续阅读本文件的剩余部分，或阅读 Wine 的手册页。 -需特别指出的是，您可以在网站：http://www.winehq.org 上找到十分丰富 +需特别指出的是，您可以在网站：https://www.winehq.org 上找到十分丰富的信息。 @@ -40,7 +40,7 @@ Wine 是自由软件，在 GNU LGPL 协议下发布；请查看 LICENSE 文件 FreeBSD 信息： Wine 通常不会在早于 FreeBSD 8.0 的系统上正常工作。 - 请查看 http://wiki.freebsd.org/Wine 以了解更多信息。 + 请查看 https://wiki.freebsd.org/Wine 以了解更多信息。 Solaris 信息：您大部分情况下可能需要使用 GNU 工具链（gcc、gas 等）来构建 Wine。 @@ -73,13 +73,13 @@ Mac OS X 信息: 可选的支持库：当可选的函数库无法在您的系统中找到时，configure 会显示对应的提示信息。 - 请查看 http://wiki.winehq.org/Recommended_Packages 以了解您应当安装的 + 请查看 https://wiki.winehq.org/Recommended_Packages 以了解您应当安装的软件包的信息。在 64 位平台上，如果以 32 位的方式编译 Wine（这是默认情况），您必须确保 - 对应函数库的 32 位版本已被安装；请查看 http://wiki.winehq.org/WineOn64bit + 对应函数库的 32 位版本已被安装；请查看 https://wiki.winehq.org/WineOn64bit 以了解详情。如果您想安装一个真正的 64 位 Wine（或者一个混合 32 位 Wine 和 - 64 位 Wine 的版本），请参阅 http://wiki.winehq.org/Wine64 以了解具体内容。 + 64 位 Wine 的版本），请参阅 https://wiki.winehq.org/Wine64 以了解具体内容。 4. 编译 @@ -103,7 +103,7 @@ make 不要忘记事先卸载先前任何安装过的、会引起冲突的 Wine 软件集。请在安装前尝试“dpkg -r wine”、“rpm -e wine”或“make uninstall”。 -一旦安装完成，您可以运行“winecfg”配置工具。请参考 http://www.winehq.org/ +一旦安装完成，您可以运行“winecfg”配置工具。请参考 https://www.winehq.org/ 网站中的支持页面以了解配置技巧。 @@ -129,26 +129,26 @@ Wine 不是十全十美的，所以某些程序可能会崩溃。如果这样的 7. 获取更多信息 -WWW: 有关 Wine 的很多信息可以在 WineHQ 网站：http://www.winehq.org/ +WWW: 有关 Wine 的很多信息可以在 WineHQ 网站：https://www.winehq.org/ 上面找到。包括：各类 Wine 相关的向导、应用程序数据库（AppDB）、漏洞跟踪系统等等。这个网站可能是您最佳的起始之处。 -FAQ: Wine 常见问题位于 http://www.winehq.org/FAQ +FAQ: Wine 常见问题位于 https://www.winehq.org/FAQ -维基： Wine 维基位于 http://wiki.winehq.org +维基： Wine 维基位于 https://wiki.winehq.org 邮件列表：存在数个服务于 Wine 用户和开发者的邮件列表； - 请查看 http://www.winehq.org/forums 以了解更多信息。 + 请查看 https://www.winehq.org/forums 以了解更多信息。 -Bugs: 请向位于 http://bugs.winehq.org 的 Wine Bugzilla 提交 bug。 +Bugs: 请向位于 https://bugs.winehq.org 的 Wine Bugzilla 提交 bug。请在提交漏洞报告前先在 bugzilla 数据库中进行搜索，检查先前是否已有类似的已知问题以避免重复，并跟踪这些问题的修复情况。 IRC: 您可以在 irc.freenode.net 的 #WineHQ 频道获取到在线帮助。 Git: 当前 Wine 的开发树可经由 Git 获取。 - 请前往 http://www.winehq.org/git 以了解更多信息。 + 请前往 https://www.winehq.org/git 以了解更多信息。如果您在代码中添加了某些内容，或是修复了某个 bug，请向 wine-devel(a)winehq.org 这个邮件列表发送对应的补丁（建议使用 -- 2.15.1

1 0

[PATCH] user32/edit: Allow buffer access after EM_GETHANDLE
by Nikolay Sivov 05 Dec '17

05 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/edit.c | 8 ++------ dlls/user32/tests/edit.c | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index c8903e26f6..114d842759 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -1264,8 +1264,6 @@ static inline void text_buffer_changed(EDITSTATE *es) */ static void EDIT_LockBuffer(EDITSTATE *es) { - if (es->hlocapp) return; - if (!es->text) { if(!es->hloc32W) return; @@ -1306,8 +1304,6 @@ static void EDIT_LockBuffer(EDITSTATE *es) */ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) { - if (es->hlocapp) return; - /* Edit window might be already destroyed */ if(!IsWindow(es->hwndSelf)) { @@ -1323,7 +1319,6 @@ static void EDIT_UnlockBuffer(EDITSTATE *es, BOOL force) ERR("es->text == 0 ... please report\n"); return; } - if (force || (es->lock_count == 1)) { if (es->hloc32W) { UINT countA = 0; @@ -5205,7 +5200,8 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B break; } - if (IsWindow(hwnd) && es) EDIT_UnlockBuffer(es, FALSE); + if (IsWindow(hwnd) && es && msg != EM_GETHANDLE) + EDIT_UnlockBuffer(es, FALSE); TRACE("hwnd=%p msg=%x (%s) -- 0x%08lx\n", hwnd, msg, SPY_GetMsgName(msg, hwnd), result); diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 783ced66c9..9372c484af 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2786,12 +2786,10 @@ static void test_EM_GETHANDLE(void) /* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */ len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); -todo_wine ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); lstrcpyA(current, str0); r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); -todo_wine ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); @@ -2802,15 +2800,28 @@ todo_wine LocalUnlock(hmem); len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); -todo_wine - ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + ok(len == lstrlenA(str1_1), "Unexpected text length %d.\n", len); lstrcpyA(current, str0); r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); -todo_wine ok((r == lstrlenA(str1_1)) && !lstrcmpA(current, str1_1), "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1); + /* See if WM_SETTEXT/EM_REPLACESEL work. */ + r = SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)str1); + ok(r, "Failed to set text.\n"); + + buffer = LocalLock(hmem); + ok(buffer != NULL && buffer[0] == '1', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + + r = SendMessageA(hEdit, EM_REPLACESEL, 0, (LPARAM)str1_1); + ok(r, "Failed to replace selection.\n"); + + buffer = LocalLock(hmem); + ok(buffer != NULL && buffer[0] == '2', "Unexpected buffer contents\n"); + LocalUnlock(hmem); + /* use LocalAlloc first to get a different handle */ halloc = LocalAlloc(LMEM_MOVEABLE, 42); ok(halloc != NULL, "got %p (expected != NULL)\n", halloc); -- 2.15.0

1 0

[Tools v2] testbot: Run make_makefiles when a file is added or removed.
by Zebediah Figura 05 Dec '17

05 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: also run 'git add -A' so that new files will actually be seen by make_makefiles. testbot/bin/build/Build.pl | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 051039f..cf1f1f3 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -74,6 +74,7 @@ sub ApplyPatch($$$) { my ($PatchFile, $PatchType, $BaseName) = @_; + my $NeedMakeMakefiles = !1; my $NeedMakefile = 0; my $NeedMakeInclude = !1; my $NeedBuildDeps = !1; @@ -84,7 +85,7 @@ sub ApplyPatch($$$) { my $Line; while (defined($Line = <FH>) && - ($NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || + (! $NeedMakeMakefiles || $NeedMakefile == 0 || ! $NeedMakeInclude || ! $NeedBuildDeps || ! $NeedImplib || ! $NeedAutoconf || ! $NeedConfigure)) { if ($Line =~ m=^diff.*(?:tests/Makefile\.in|Make\.vars\.in|Make\.rules\.in|Maketest\.rules\.in)$=) @@ -111,13 +112,18 @@ sub ApplyPatch($$$) { $NeedConfigure = 1; } + elsif ($Line =~ m=^new file= || $Line =~ m=^deleted file= || $Line =~ m=^rename=) + { + $NeedMakeMakefiles = 1; + } } close FH; } InfoMsg "Applying patch\n"; system("( cd $DataDir/wine && set -x && " . - " git apply --verbose $PatchFile " . + " git apply --verbose $PatchFile && " . + " git add -A " . ") >> $LogDir/Build.log 2>&1"); if ($? != 0) { @@ -125,6 +131,20 @@ sub ApplyPatch($$$) return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); } + if ($NeedMakeMakefiles) + { + InfoMsg "Running make_makefiles\n"; + system("( cd $DataDir/wine && set -x && " . + " ./tools/make_makefiles " . + ") >> $LogDir/Build.log 2>&1"); + if ($? != 0) + { + LogMsg "make_makefiles failed\n"; + return (-1, $NeedMakeInclude, $NeedBuildDeps, $NeedImplib, $NeedConfigure); + } + $NeedConfigure = 1; + } + if ($NeedAutoconf && ! $NeedConfigure) { InfoMsg "Running autoconf\n"; -- 2.7.4

2 1

[PATCH] msi: Complain louder if we can't find a custom action DLL or EXE.
by Zebediah Figura 05 Dec '17

05 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Cursory testing also seems to show that we shouldn't be returning success in the case that we fail to load a DLL, but more thorough testing will be needed in order not to trigger bug #26162. dlls/msi/custom.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 02c3440..2570fe2 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -263,7 +263,7 @@ static MSIBINARY *create_temp_binary( MSIPACKAGE *package, LPCWSTR source, BOOL /* keep a reference to prevent the dll from being unloaded */ if (dll && !(binary->module = LoadLibraryW( tmpfile ))) { - WARN( "failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() ); + ERR( "failed to load dll %s (%u)\n", debugstr_w( tmpfile ), GetLastError() ); } binary->source = strdupW( source ); binary->tmpfile = tmpfile; @@ -567,7 +567,7 @@ static DWORD ACTION_CallDllFunction( const GUID *guid ) hModule = LoadLibraryW( dll ); if (!hModule) { - WARN( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); + ERR( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); return ERROR_SUCCESS; } @@ -700,7 +700,7 @@ static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir ) } if (!len_exe) { - WARN("can't find executable %u\n", GetLastError()); + ERR("can't find executable %u\n", GetLastError()); msi_free( exe ); return INVALID_HANDLE_VALUE; } @@ -738,7 +738,7 @@ static HANDLE execute_command( const WCHAR *app, WCHAR *arg, const WCHAR *dir ) msi_free( exe ); if (!ret) { - WARN("unable to execute command %u\n", GetLastError()); + ERR("unable to execute command %u\n", GetLastError()); return INVALID_HANDLE_VALUE; } CloseHandle( info.hThread ); -- 2.7.4

2 1

[PATCH] po: Update Lithuanian translation
by Aurimas Fišeras 05 Dec '17

05 Dec '17

1 0

[PATCH] po: Update Russian translation
by Nikolay Sivov 05 Dec '17

05 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/po/ru.po b/po/ru.po index f3e2baf3e1..3b070da543 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-11-18 12:12+0300\n" +"PO-Revision-Date: 2017-12-05 09:18+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -12015,17 +12015,6 @@ msgid "Icons (*.ico)" msgstr "Значки (*.ico)" #: reg.rc:35 -#, fuzzy -#| msgid "" -#| "Usage:\n" -#| " REG [operation] [parameters]\n" -#| "\n" -#| "Supported operations:\n" -#| " ADD | DELETE | IMPORT | QUERY\n" -#| "\n" -#| "For help on a specific operation, type:\n" -#| " REG [operation] /?\n" -#| "\n" msgid "" "Usage:\n" " REG [operation] [parameters]\n" @@ -12041,7 +12030,7 @@ msgstr "" " REG [операция] [параметры]\n" "\n" "Поддерживаемые операции:\n" -" ADD | DELETE | IMPORT | QUERY\n" +" ADD | DELETE | IMPORT | EXPORT | QUERY\n" "\n" "Для получения справки по конкретной операции используйте:\n" " REG [операция] /?\n" @@ -12184,22 +12173,16 @@ msgid "reg: Unrecognized escape sequence [\\%1!c!]\n" msgstr "reg: неизвестная управляющая последовательность [\\%1!c!]\n" #: reg.rc:70 -#, fuzzy -#| msgid "REG IMPORT file.reg\n" msgid "REG EXPORT key_name file.reg [/y]\n" -msgstr "REG IMPORT file.reg\n" +msgstr "REG EXPORT имя_ключа file.reg [/y]\n" #: reg.rc:71 -#, fuzzy -#| msgid "regedit: Invalid system key [%1]\n" msgid "reg: Invalid system key [%1]\n" -msgstr "regedit: неверный системный ключ [%1]\n" +msgstr "reg: неверный системный ключ [%1]\n" #: reg.rc:72 -#, fuzzy -#| msgid "The registry value '%1' already exists. Do you want to overwrite it?" msgid "The file '%1' already exists. Do you want to overwrite it?" -msgstr "Значение «%1» уже существует. Вы хотите заменить его?" +msgstr "Файл «%1» уже существует. Вы хотите заменить его?" #: regedit.rc:34 msgid "&Registry" -- 2.15.0

1 0

Wine Staging (was: WineConf action items)
by Gerald Pfeifer 04 Dec '17

04 Dec '17

Vincent Povirk wrote: > I've decided to spend some time researching staging patches and > bringing them to the attention of maintainers or others who may be > able to put in the extra work required to get them in. This is based > on a discussion we had where some people complained about the number > of patches in staging that aren't being merged. That's a great initiative, thanks for doing that, Vincent. On a related note, recently the release of a Wine staging patchset has been trailing the corresponding release of Wine 2.2x for more than a week (for example, it's still not available for Wine 2.22). What's the outlook there? Any chance that patchset can be made available a day or two after Wine goes out (or, ideally, more or less at the same time)? Gerald

2 1

_Cnd_timedwait timeout
by Stefan Dösinger 04 Dec '17

04 Dec '17

Hi Daniel and Piotr, I am having a trouble with _Cnd_timedwait and I am trying to understand a few things. The problem I'm running into is that the application I am dealing with passes a timestamp that is 30 days into the future. This overflows in _Xtime_diff_to_millis(2) and the result we get is somewhere in the area of -1708070296. Now _Cnd_timedwait casts this to an ULONGLONG, so I would expect the multiplication to come up with the right result, but no, the function passes a timeout of 170807029600000 to NtWaitForKeyedEvent, which is interpreted as an absolute value in the past and instantly times out. To get the right result I have to assign the result of _Xtime_diff_to_millis to an ULONG and cast this back to a 64 bit signed value - otherwise the multiplication happens in unsigned 32 bit and results in a positive number that will fit in a a signed 64 bit integer with ease. So my two questions are: 1) Why go through _Xtime_diff_to_millis at all? If I understand the server code right NtWaitForKeyedEvent should do the right thing if we pass timeout.QuadPart = sec * 1000 * 1000 * 100 + nsec / 10. And indeed in my quick testing this works for the app and passes the tests. Are there timezone issues? 2) What C integer legalese prevents the current code from working? All the signed/unsigned conversion references I found talk about assignments, not casts in calculations. Cheers, Stefan

3 5

[PATCH] user32/tests: Added some tests for WM_GETTEXTLENGTH/WM_GETTEXT after EM_GETHANDLE was used
by Nikolay Sivov 04 Dec '17

04 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/edit.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 0926a589e2..783ced66c9 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2735,6 +2735,7 @@ static void test_EM_GETHANDLE(void) { static const char str0[] = "untouched"; static const char str1[] = "1111+1111+1111#"; + static const char str1_1[] = "2111+1111+1111#"; static const char str2[] = "2222-2222-2222-2222#"; static const char str3[] = "3333*3333*3333*3333*3333#"; CHAR current[42]; @@ -2783,6 +2784,33 @@ static void test_EM_GETHANDLE(void) "got %d and \"%s\" (expected %d and \"%s\")\n", len, buffer, lstrlenA(str1), str1); LocalUnlock(hmem); + /* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */ + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); +todo_wine + ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); + + /* Application altered buffer contents, see if WM_GETTEXTLENGTH/WM_GETTEXT pick that up. */ + buffer = LocalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + buffer[0] = '2'; + LocalUnlock(hmem); + + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); +todo_wine + ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok((r == lstrlenA(str1_1)) && !lstrcmpA(current, str1_1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1); + /* use LocalAlloc first to get a different handle */ halloc = LocalAlloc(LMEM_MOVEABLE, 42); ok(halloc != NULL, "got %p (expected != NULL)\n", halloc); -- 2.15.0

1 0

[Tools] testbot/Janitor: Import File::Path. It's needed for rmtree().
by Francois Gouget 04 Dec '17

04 Dec '17

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index fd1b256b..c07c21bd 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -37,6 +37,8 @@ sub BEGIN } } +use File::Path; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Log; -- 2.15.0

1 0

[PATCH] testbot: Don't try to use the Message-Id if the email had none.
by Francois Gouget 04 Dec '17

04 Dec '17

This can happen if one directly feeds the output of git format-patch to the TestBot through formail, which can be useful for testing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Patches.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index b5320dc2..42118e61 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -101,9 +101,12 @@ sub FromSubmission($$) $self->Subject(substr($Subject, 0, $PropertyDescriptor->GetMaxLength())); my $MessageId = $Head->get("Message-Id"); - $MessageId =~ s/\s*\n\s*/ /gs; - $PropertyDescriptor = $self->GetPropertyDescriptorByName("MessageId"); - $self->MessageId(substr($MessageId, 0, $PropertyDescriptor->GetMaxLength())); + if ($MessageId) + { + $MessageId =~ s/\s*\n\s*/ /gs; + $PropertyDescriptor = $self->GetPropertyDescriptorByName("MessageId"); + $self->MessageId(substr($MessageId, 0, $PropertyDescriptor->GetMaxLength())); + } $self->Disposition("Processing"); } -- 2.15.0

1 0

[PATCH] appwiz.cpl: move WineHQ URLs to https (try 2)
by Austin English 04 Dec '17

04 Dec '17

Try 2: Don't update winegecko/winemono download URLs, only the wiki links Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/appwiz.cpl/appwiz.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 5c8b31b525..589f27548f 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -102,7 +102,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Wine could not find a Gecko package which is needed for applications embedding HTML " \ "to work correctly. Wine can automatically download and install it for you.\n\n" \ "Note: it is recommended to use your distribution's packages instead. " \ - "See <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> for details.", + "See <a href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a> for details.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP @@ -117,7 +117,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Wine could not find a wine-mono package which is needed for .NET applications " \ "to work correctly. Wine can automatically download and install it for you.\n\n" \ "Note: it is recommended to use your distribution's packages instead. " \ - "See <a href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for details.", + "See <a href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for details.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP -- 2.13.6

1 0

[PATCH] mshtml: Avoid potential moniker instance leak
by Nikolay Sivov 04 Dec '17

04 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/persist.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 25767ef57c..b82750a85e 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -918,10 +918,9 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream prepare_for_binding(This, mon, FALSE); hres = set_moniker(This->window, mon, NULL, NULL, NULL, TRUE); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) + hres = channelbsc_load_stream(This->window->pending_window, mon, pStm); - hres = channelbsc_load_stream(This->window->pending_window, mon, pStm); IMoniker_Release(mon); return hres; } @@ -976,10 +975,9 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) prepare_for_binding(This, mon, FALSE); hres = set_moniker(This->window, mon, NULL, NULL, NULL, FALSE); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) + hres = channelbsc_load_stream(This->window->pending_window, mon, NULL); - hres = channelbsc_load_stream(This->window->pending_window, mon, NULL); IMoniker_Release(mon); return hres; } -- 2.15.0

2 1

[PATCH 6/6] mshtml/tests: Added more event object tests.
by Jacek Caban 04 Dec '17

04 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/events.js | 256 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 255 insertions(+), 1 deletion(-)

1 0

[PATCH 5/6] mshtml: Expose IDocumentEvent to scripts.
by Jacek Caban 04 Dec '17

04 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 4 +++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 1 + 3 files changed, 5 insertions(+), 1 deletion(-)

1 0

[PATCH 4/6] mshtml: Added IDOMEvent::dispatchEvent implementation.
by Jacek Caban 04 Dec '17

04 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 46 ++++++++++++++++++++++++++++++++++------------ dlls/mshtml/tests/events.c | 11 +++++++++++ 2 files changed, 45 insertions(+), 12 deletions(-)

1 0

[PATCH 3/6] mshtml: Don't store dispatch mode in DOMEvent object.
by Jacek Caban 04 Dec '17

04 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 33 +++++++++++++++++++++------------ dlls/mshtml/htmlevent.h | 1 - 2 files changed, 21 insertions(+), 13 deletions(-)

1 0

[PATCH 2/6] mshtml: Don't call preventDefault in stopPropagation.
by Jacek Caban 04 Dec '17

04 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 1 - 1 file changed, 1 deletion(-)

1 0

[PATCH 1/6] mshtml: Added IDOMEvent::initEvent implementation.
by Jacek Caban 04 Dec '17

04 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 33 ++++++++++++++++++++++++++++++--- dlls/mshtml/mshtml_private.h | 4 ++++ dlls/mshtml/nsembed.c | 1 - 3 files changed, 34 insertions(+), 4 deletions(-)

1 0

[PATCH 1/2] readme: Update Swedish translation.
by Lauri Kenttä 04 Dec '17

04 Dec '17

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- documentation/README.sv | 42 +++++++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 17 deletions(-) diff --git a/documentation/README.sv b/documentation/README.sv index eb7260efcb..b68e6997d9 100644 --- a/documentation/README.sv +++ b/documentation/README.sv @@ -4,7 +4,7 @@ Wine är ett program som gör det möjligt att köra Windows-program (inkluderat DOS, Windows 3.x, Win32 och Win64) i Unix. Det består av en programstartare som startar och kör Windows-programfiler, samt ett bibliotek (kallat Winelib) som implementerar Windows API-anrop med hjälp -av deras Unix- eller X11-motsvarigheter. Biblioteket kan också användas +av motsvarande Unix-, X11- eller Mac-anrop. Biblioteket kan också användas till att porta Windows-kod till vanliga Unix-program. Wine är fri programvara, utgett under villkoren i GNU LGPL; se @@ -18,8 +18,16 @@ Kör följande kommandon i rotkatalogen för Wines källkod: ./configure make +Efteråt antingen installera Wine: + +make install + +Eller kör Wine direkt från dess rotkatalog: + +./wine notepad + Kör program med "wine [val] program". Se resten av denna fil, -Wines man-sidor samt sist men inte minst http://www.winehq.org/ för mer +Wines man-sidor samt sist men inte minst https://www.winehq.org/ för mer information och tips om hur problem kan lösas. @@ -39,7 +47,7 @@ stöder kerneltrådar kommer eventuellt att stödjas i framtiden. Information för FreeBSD: Wine kommer i regel inte att fungera på FreeBSD-versioner äldre än 8.0. - Se http://wiki.freebsd.org/Wine för mer information. + Se https://wiki.freebsd.org/Wine för mer information. Information för Solaris: Wine måste antagligen byggas med GNU toolchain (gcc, gas etc.). @@ -71,14 +79,10 @@ Grundläggande krav: Valfria stödbibliotek: configure-skriptet visar varningar när valfria bibliotek inte hittats. - Se http://wiki.winehq.org/Recommended_Packages för information om - vilka paket du bör installera. + Se https://wiki.winehq.org/Recommended_Packages för information om vilka + paket du bör installera. På 64-bitars system måste du säkerställa att du + installerar 32-bitars versionerna av dessa bibliotek. - På 64 bit-system måste du säkerställa att 32 bit-versionerna av - ovannämnda bibliotek installerats; se http://wiki.winehq.org/WineOn64bit - för närmare detaljer. Om du vill ha ett sant 64-bit Wine (eller en mixad - 32- och 64-bit Wine-installation), se http://wiki.winehq.org/Wine64 för - detaljer. 4. KOMPILERING @@ -96,6 +100,7 @@ Kör './configure --help' för att se inställningar och val vid kompilering. För mer information se https://wiki.winehq.org/Building_Wine + 5. INSTALLATION När Wine är byggt kan du köra "make install" för att installera det; @@ -105,7 +110,7 @@ Glöm inte att först avinstallera gamla Wine-versioner. Pröva antingen "dpkg -r wine", "rpm -e wine" eller "make uninstall" före installationen. När Wine är installerat kan du använda inställningsprogrammet "winecfg". -Se hjälpavdelningen på http://www.winehq.org/ för tips om inställningar. +Se hjälpavdelningen på https://www.winehq.org/ för tips om inställningar. 6. KÖRNING AV PROGRAM @@ -132,18 +137,18 @@ rapporterar ett fel. 7. MER INFORMATION Internet: Mycket information om Wine finns samlat på WineHQ på - http://www.winehq.org/ : diverse guider, en programdatabas samt + https://www.winehq.org/ : diverse guider, en programdatabas samt felspårning. Detta är antagligen det bästa stället att börja. -Frågor: Frågor och svar om Wine finns samlade på http://www.winehq.org/FAQ +Frågor: Frågor och svar om Wine finns samlade på https://www.winehq.org/FAQ -Wiki: Wines Wiki finns på http://wiki.winehq.org +Wiki: Wines Wiki finns på https://wiki.winehq.org E-postlistor: Det finns flera e-postlistor för Wine-användare och -utvecklare; se - http://www.winehq.org/forums för mer information. + https://www.winehq.org/forums för mer information. -Fel: Rapportera fel till Wines Bugzilla på http://bugs.winehq.org +Fel: Rapportera fel till Wines Bugzilla på https://bugs.winehq.org Sök i Bugzilla-databasen för att se om problemet redan finns rapporterat innan du sänder en felrapport. @@ -151,7 +156,7 @@ IRC: Hjälp finns tillgänglig online på kanalen #WineHQ på irc.freenode.net. Git: Wines nuvarande utvecklingsversion finns tillgänglig genom Git. - Gå till http://www.winehq.org/git för mer information. + Gå till https://www.winehq.org/git för mer information. Om du lägger till något eller fixar ett fel, är det bra om du sänder en patch (förslagsvis med git-format-patch) till listan wine-devel(a)winehq.org @@ -165,3 +170,6 @@ julliard(a)winehq.org Översatt till svenska av Anders Jonsson anders.jonsson(a)norsjonet.se +och +Lauri Kenttä +lauri.kentta(a)gmail.com -- 2.15.1

1 0

[PATCH] krnl386.exe16: Check for pending DPMI events in call16_handler().
by Zebediah Figura 04 Dec '17

04 Dec '17

If a #GP fault is generated in 16-bit code while (V)IF is clear, we insert a pending event check. However, a #GP can be generated by simply accessing invalid memory, and if this occurs winedbg will report the address of DPMI_PendingEventCheck() rather than the address of the #GP fault. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/krnl386.exe16/wowthunk.c | 2 +- tools/winebuild/relay.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index 539bc74..9a54170 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -243,7 +243,7 @@ static DWORD call16_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RE * emulated because the instruction emulation requires * original CS:IP and the emulation may change TEB.dpmi_vif. */ - if(get_vm86_teb_info()->dpmi_vif) + if (get_vm86_teb_info()->dpmi_vif && get_vm86_teb_info()->vm86_pending) insert_event_check( context ); if (ret != ExceptionContinueSearch) return ret; diff --git a/tools/winebuild/relay.c b/tools/winebuild/relay.c index 4b78f68..94fd756 100644 --- a/tools/winebuild/relay.c +++ b/tools/winebuild/relay.c @@ -36,9 +36,6 @@ /* fix this if the x86_thread_data structure is changed */ #define GS_OFFSET 0x1d8 /* FIELD_OFFSET(TEB,SystemReserved2) + FIELD_OFFSET(struct x86_thread_data,gs) */ -#define DPMI_VIF_OFFSET (0x1fc + 0) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,dpmi_vif) */ -#define VM86_PENDING_OFFSET (0x1fc + 4) /* FIELD_OFFSET(TEB,GdiTebBatch) + FIELD_OFFSET(WINE_VM86_TEB_INFO,vm86_pending) */ - static void function_header( const char *name ) { output( "\n\t.align %d\n", get_alignment(4) ); @@ -770,13 +767,6 @@ static void BuildPendingEventCheck(void) function_header( "DPMI_PendingEventCheck" ); - /* Check for pending events. */ - - output( "\t.byte 0x64\n\ttestl $0xffffffff,(%d)\n", VM86_PENDING_OFFSET ); - output( "\tje %s\n", asm_name("DPMI_PendingEventCheck_Cleanup") ); - output( "\t.byte 0x64\n\ttestl $0xffffffff,(%d)\n", DPMI_VIF_OFFSET ); - output( "\tje %s\n", asm_name("DPMI_PendingEventCheck_Cleanup") ); - /* Process pending events. */ output( "\tsti\n" ); -- 2.7.4

2 3

[PATCH 1/3] ntdll: NtReadFileScatter results are reported asynchronously
by Andrew Eikum 04 Dec '17

04 Dec '17

This patch sequence fixes Wolfenstein II, Bug 43935. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 53 +++++++++++++++++++++++++++++++++++++++------- dlls/ntdll/file.c | 2 +- 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 0b8cef23f8..8f5f392822 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -4353,7 +4353,8 @@ static void test_WriteFileGather(void) FILE_SEGMENT_ELEMENT fse[2]; OVERLAPPED ovl, *povl = NULL; SYSTEM_INFO si; - LPVOID buf = NULL; + LPVOID wbuf = NULL, rbuf1; + BOOL br; ret = GetTempPathA( MAX_PATH, temp_path ); ok( ret != 0, "GetTempPathA error %d\n", GetLastError() ); @@ -4371,12 +4372,16 @@ static void test_WriteFileGather(void) ok( hiocp2 != 0, "CreateIoCompletionPort failed err %u\n", GetLastError() ); GetSystemInfo( &si ); - buf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); - ok( buf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + wbuf = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( wbuf != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); + + rbuf1 = VirtualAlloc( NULL, si.dwPageSize, MEM_COMMIT, PAGE_READWRITE ); + ok( rbuf1 != NULL, "VirtualAlloc failed err %u\n", GetLastError() ); memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; + memset( wbuf, 0x42, si.dwPageSize ); + fse[0].Buffer = wbuf; if (!WriteFileGather( hfile, fse, si.dwPageSize, NULL, &ovl )) ok( GetLastError() == ERROR_IO_PENDING, "WriteFileGather failed err %u\n", GetLastError() ); @@ -4384,20 +4389,52 @@ static void test_WriteFileGather(void) ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + /* read exact size */ memset( &ovl, 0, sizeof(ovl) ); memset( fse, 0, sizeof(fse) ); - fse[0].Buffer = buf; - if (!ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl )) - ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); + fse[0].Buffer = rbuf1; + memset( rbuf1, 0, si.dwPageSize ); + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should be asynchronous\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "ReadFileScatter failed err %u\n", GetLastError() ); ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); ok( ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError()); ok( povl == &ovl, "wrong ovl %p\n", povl ); + ok( memcmp( rbuf1, wbuf, si.dwPageSize ) == 0, + "data was not read into buffer\n" ); + + /* start read at EOF */ + memset( &ovl, 0, sizeof(ovl) ); + S(U(ovl)).OffsetHigh = 0; + S(U(ovl)).Offset = si.dwPageSize; + memset( fse, 0, sizeof(fse) ); + fse[0].Buffer = rbuf1; + br = ReadFileScatter( hfile, fse, si.dwPageSize, NULL, &ovl ); + ok( br == FALSE, "ReadFileScatter should have failed\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF || + GetLastError() == ERROR_IO_PENDING, "ReadFileScatter gave wrong error %u\n", GetLastError() ); + if (GetLastError() == ERROR_IO_PENDING) + { + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 1000 ); + ok( !ret, "GetQueuedCompletionStatus should have returned failure\n" ); + ok( GetLastError() == ERROR_HANDLE_EOF, "Got wrong error: %u\n", GetLastError() ); + ok( povl == &ovl, "wrong ovl %p\n", povl ); + } + else + { + ret = GetQueuedCompletionStatus( hiocp2, &size, &key, &povl, 100 ); + ok( !ret, "GetQueuedCompletionStatus failed err %u\n", GetLastError() ); + ok( GetLastError() == WAIT_TIMEOUT, "GetQueuedCompletionStatus gave wrong error %u\n", GetLastError() ); + ok( povl == NULL, "wrong ovl %p\n", povl ); + } + CloseHandle( hfile ); CloseHandle( hiocp1 ); CloseHandle( hiocp2 ); - VirtualFree( buf, 0, MEM_RELEASE ); + VirtualFree( wbuf, 0, MEM_RELEASE ); + VirtualFree( rbuf1, 0, MEM_RELEASE ); DeleteFileA( filename ); } diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index ca2afa0e89..12b1d0f6c5 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -1105,7 +1105,7 @@ NTSTATUS WINAPI NtReadFileScatter( HANDLE file, HANDLE event, PIO_APC_ROUTINE ap if (send_completion) NTDLL_AddCompletion( file, cvalue, status, total ); - return status; + return STATUS_PENDING; } -- 2.15.0

3 5

[PATCH v6] msvcrt: Don't crash if _vsnwprintf gets NULL as format string and add test
by Fabian Maurer 04 Dec '17

04 Dec '17

v2 Fix crash on older test machines v3 Check for dll function instead of OS version Add test for errno Moved test to msvcrt90 to be able to use _set_invalid_parameter_handler v4 proper patch name v5 use MSVCRT_CHECK_PMT remove unneeded XP check v6 Fix 64bit compilation issue Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/msvcr90/tests/msvcr90.c | 31 +++++++++++++++++++++++++++++++ dlls/msvcrt/printf.h | 3 +++ 2 files changed, 34 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 0975d00331..85dd80b80c 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -133,6 +133,7 @@ static char* (__cdecl *p_setlocale)(int, const char*); static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *handler)(_FPIEEE_RECORD*)); static int (__cdecl *p__memicmp)(const char*, const char*, size_t); static int (__cdecl *p__memicmp_l)(const char*, const char*, size_t, _locale_t); +static int (__cdecl *p__vsnwprintf)(wchar_t *buffer,size_t count, const wchar_t *format, __ms_va_list valist); /* make sure we use the correct errno */ #undef errno @@ -401,6 +402,7 @@ static BOOL init(void) SET(p__fpieee_flt, "_fpieee_flt"); SET(p__memicmp, "_memicmp"); SET(p__memicmp_l, "_memicmp_l"); + SET(p__vsnwprintf, "_vsnwprintf"); if (sizeof(void *) == 8) { @@ -1864,6 +1866,34 @@ static void test__memicmp_l(void) ok(ret == -1, "got %d\n", ret); } +static int WINAPIV _vsnwprintf_wrapper(wchar_t *str, size_t len, const wchar_t *format, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, format); + ret = p__vsnwprintf(str, len, format, valist); + __ms_va_end(valist); + return ret; +} + +void test__vsnwprintf(void) +{ + int ret; + WCHAR str[2] = {0}; + + _invalid_parameter_handler old_handler = p_set_invalid_parameter_handler(test_invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + str[0] = 'x'; + ret = _vsnwprintf_wrapper(str, 0, NULL); + ok(ret == -1, "got %d, expected -1\n", ret); + ok(str[0] == 'x', "Expected string to be unchanged.\n"); + CHECK_CALLED(invalid_parameter_handler, EINVAL); + + ok(p_set_invalid_parameter_handler(old_handler) == test_invalid_parameter_handler, "Cannot reset invalid parameter handler\n"); +} + START_TEST(msvcr90) { if(!init()) @@ -1897,6 +1927,7 @@ START_TEST(msvcr90) test__mbstok_s(); test__memicmp(); test__memicmp_l(); + test__vsnwprintf(); #ifdef __i386__ test__fpieee_flt(); #endif diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 4ba02bafdb..ee8120e149 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -376,6 +376,9 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API TRACE("Format is: %s\n", FUNC_NAME(debugstr)(fmt)); + if (!MSVCRT_CHECK_PMT(fmt != NULL)) + return -1; + if(!locale) locinfo = get_locinfo(); else -- 2.15.1

2 1

[PATCH 2/2] wined3d: Really remove an outdated comment.
by Henri Verbeet 04 Dec '17

04 Dec '17

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 04ab66b..5d08c00 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2713,10 +2713,6 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } } -/***************************************************************************** - * Functions to generate GLSL strings from DirectX Shader bytecode begin here. - ****************************************************************************/ - /* Prototypes */ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *ins, const struct wined3d_shader_src_param *wined3d_src, DWORD mask, struct glsl_src_param *glsl_src); -- 2.1.4

1 0

[PATCH 1/2] wined3d: Unbind currently bound FBOs before dispatching compute shaders.
by Henri Verbeet 04 Dec '17

04 Dec '17

From: Fabian Maurer <dark.shadow4(a)web.de> Many thanks to Matias N. Goldberg and Philip Rebohle for investigating and solving the bug! Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8af9e4b..23f63aa 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4013,6 +4013,16 @@ void context_apply_compute_state(struct wined3d_context *context, context->update_unordered_access_view_bindings = 1; } + /* Updates to currently bound render targets aren't necessarily coherent + * between the graphics and compute pipelines. Unbind any currently bound + * FBO here to ensure preceding updates to its attachments by the graphics + * pipeline are visible to the compute pipeline. + * + * Without this, the bloom effect in Nier:Automata is too bright on the + * Mesa radeonsi driver, and presumably on other Mesa based drivers. */ + context_bind_fbo(context, GL_FRAMEBUFFER, 0); + context_invalidate_state(context, STATE_FRAMEBUFFER); + context->last_was_blit = FALSE; } -- 2.1.4

1 0

[PATCH] wininet/tests: Fix some leaks (Coverity)
by Nikolay Sivov 04 Dec '17

04 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wininet/tests/ftp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wininet/tests/ftp.c b/dlls/wininet/tests/ftp.c index 567545d2b9..d2118faded 100644 --- a/dlls/wininet/tests/ftp.c +++ b/dlls/wininet/tests/ftp.c @@ -112,6 +112,7 @@ static void test_connect(HINTERNET hInternet) ok ( hFtp != NULL, "InternetConnect failed : %d\n", GetLastError()); ok ( GetLastError() == ERROR_SUCCESS, "ERROR_SUCCESS, got %d\n", GetLastError()); + InternetCloseHandle(hFtp); SetLastError(0xdeadbeef); hFtp = InternetConnectA(hInternet, "ftp.winehq.org", INTERNET_DEFAULT_FTP_PORT, "", NULL, @@ -125,6 +126,7 @@ static void test_connect(HINTERNET hInternet) { ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + InternetCloseHandle(hFtp); } } -- 2.15.0

1 0

[PATCH] comctl32/tests: Some tests for focus handling in owner-data listviews
by Nikolay Sivov 04 Dec '17

04 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/listview.c | 122 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0e12362b69..4e2efe422b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -193,6 +193,12 @@ static const struct message empty_seq[] = { { 0 } }; +static const struct message parent_focus_change_ownerdata_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_GETDISPINFOA }, + { 0 } +}; + static const struct message forward_erasebkgnd_parent_seq[] = { { WM_ERASEBKGND, sent }, { 0 } @@ -5996,6 +6002,7 @@ static void test_oneclickactivate(void) static void test_callback_mask(void) { + LVITEMA item; DWORD mask; HWND hwnd; BOOL ret; @@ -6012,6 +6019,121 @@ static void test_callback_mask(void) ok(mask == ~0u, "got 0x%08x\n", mask); DestroyWindow(hwnd); + + /* LVS_OWNERDATA, mask LVIS_FOCUSED */ + hwnd = create_listview_control(LVS_REPORT | LVS_OWNERDATA); + + mask = SendMessageA(hwnd, LVM_GETCALLBACKMASK, 0, 0); + ok(mask == 0, "Unexpected callback mask %#x.\n", mask); + + ret = SendMessageA(hwnd, LVM_SETCALLBACKMASK, LVIS_FOCUSED, 0); + ok(ret, "Failed to set callback mask, %d\n", ret); + + mask = SendMessageA(hwnd, LVM_GETCALLBACKMASK, 0, 0); + ok(mask == LVIS_FOCUSED, "Unexpected callback mask %#x.\n", mask); + + ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + ok(ret, "Failed to set item count.\n"); + + ret = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); + ok(ret == -1, "Unexpected selection mark, %d\n", ret); + + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + ret = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + ok(ret, "Failed to set item state.\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); +todo_wine + ok(ret == 0, "Unexpected focused item, ret %d\n", ret); + + ret = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); +todo_wine + ok(ret == 0, "Unexpected selection mark, %d\n", ret); + + ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 0, 0); + ok(ret, "Failed to set item count.\n"); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + ok(ret == -1, "Unexpected focused item, ret %d\n", ret); + + ret = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); + ok(ret == -1, "Unexpected selection mark, %d\n", ret); + + ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + ok(ret, "Failed to set item count.\n"); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + ok(ret == -1, "Unexpected focused item, ret %d\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent seq, owner data/focus 1", FALSE); + + /* LVS_OWNDERDATA, empty mask */ + ret = SendMessageA(hwnd, LVM_SETCALLBACKMASK, 0, 0); + ok(ret, "Failed to set callback mask, %d\n", ret); + + ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + ok(ret, "Failed to set item count.\n"); + + ret = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); + ok(ret == -1, "Unexpected selection mark, %d\n", ret); + + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + ret = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + ok(ret, "Failed to set item state.\n"); + + ret = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); + ok(ret == 0, "Unexpected selection mark, %d\n", ret); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + ok(ret == 0, "Unexpected focused item, ret %d\n", ret); + + ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 0, 0); + ok(ret, "Failed to set item count.\n"); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + ok(ret == -1, "Unexpected focused item, ret %d\n", ret); + + ret = SendMessageA(hwnd, LVM_GETSELECTIONMARK, 0, 0); +todo_wine + ok(ret == -1, "Unexpected selection mark, %d\n", ret); + + ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + ok(ret, "Failed to set item count.\n"); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); +todo_wine + ok(ret == -1, "Unexpected focused item, ret %d\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, "parent seq, owner data/focus 2", TRUE); + + /* 2 items, focus on index 0, reduce to 1 item. */ + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 2, 0); + ok(ret, "Failed to set item count.\n"); + + ret = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + ok(ret, "Failed to set item state.\n"); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + ok(ret == 0, "Unexpected focused item, ret %d\n", ret); + + ret = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + ok(ret, "Failed to set item count.\n"); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEM, -1, LVNI_FOCUSED); + ok(ret == 0, "Unexpected focused item, ret %d\n", ret); + + ok_sequence(sequences, PARENT_SEQ_INDEX, parent_focus_change_ownerdata_seq, + "parent seq, owner data/focus 3", TRUE); + + DestroyWindow(hwnd); } START_TEST(listview) -- 2.15.0

1 0

[PATCH] httpapi/tests: Added some basic tests for session and group creation
by Nikolay Sivov 04 Dec '17

04 Dec '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- configure | 3 +- configure.ac | 3 +- dlls/httpapi/tests/Makefile.in | 5 ++ dlls/httpapi/tests/httpapi.c | 193 +++++++++++++++++++++++++++++++++++++++++ include/http.h | 1 + 5 files changed, 203 insertions(+), 2 deletions(-) create mode 100644 dlls/httpapi/tests/Makefile.in create mode 100644 dlls/httpapi/tests/httpapi.c diff --git a/configure b/configure index 1da4efa683..4704e165b7 100755 --- a/configure +++ b/configure @@ -18560,7 +18560,8 @@ wine_fn_config_dll hlink enable_hlink clean,implib wine_fn_config_test dlls/hlink/tests hlink_test wine_fn_config_dll hnetcfg enable_hnetcfg clean wine_fn_config_test dlls/hnetcfg/tests hnetcfg_test -wine_fn_config_dll httpapi enable_httpapi +wine_fn_config_dll httpapi enable_httpapi implib +wine_fn_config_test dlls/httpapi/tests httpapi_test wine_fn_config_dll iccvid enable_iccvid clean wine_fn_config_dll icmp enable_icmp wine_fn_config_dll ieframe enable_ieframe clean,implib diff --git a/configure.ac b/configure.ac index 6cba83b16d..69fad417ba 100644 --- a/configure.ac +++ b/configure.ac @@ -3206,7 +3206,8 @@ WINE_CONFIG_DLL(hlink,,[clean,implib]) WINE_CONFIG_TEST(dlls/hlink/tests) WINE_CONFIG_DLL(hnetcfg,,[clean]) WINE_CONFIG_TEST(dlls/hnetcfg/tests) -WINE_CONFIG_DLL(httpapi) +WINE_CONFIG_DLL(httpapi,,[implib]) +WINE_CONFIG_TEST(dlls/httpapi/tests) WINE_CONFIG_DLL(iccvid,,[clean]) WINE_CONFIG_DLL(icmp) WINE_CONFIG_DLL(ieframe,,[clean,implib]) diff --git a/dlls/httpapi/tests/Makefile.in b/dlls/httpapi/tests/Makefile.in new file mode 100644 index 0000000000..1c253a789b --- /dev/null +++ b/dlls/httpapi/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = httpapi.dll +IMPORTS = httpapi + +C_SRCS = \ + httpapi.c diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c new file mode 100644 index 0000000000..47df2260c1 --- /dev/null +++ b/dlls/httpapi/tests/httpapi.c @@ -0,0 +1,193 @@ +/* + * HttpApi tests + * + * Copyright 2017 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winnt.h" +#include "winternl.h" +#include "http.h" + +#include "wine/test.h" + +static ULONG (WINAPI *pHttpCreateServerSession)(HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *session_id, + ULONG reserved); +static ULONG (WINAPI *pHttpCloseServerSession)(HTTP_SERVER_SESSION_ID session_id); +static ULONG (WINAPI *pHttpCreateUrlGroup)(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROUP_ID *group_id, + ULONG reserved); +static ULONG (WINAPI *pHttpCloseUrlGroup)(HTTP_URL_GROUP_ID group_id); + +static void init(void) +{ + HMODULE mod = GetModuleHandleA("httpapi.dll"); + +#define X(f) p##f = (void *)GetProcAddress(mod, #f) + X(HttpCreateServerSession); + X(HttpCloseServerSession); + X(HttpCreateUrlGroup); + X(HttpCloseUrlGroup); +#undef X +} + +static void test_HttpCreateHttpHandle(void) +{ + HANDLE handle, handle2; + ULONG ret; + BOOL b; + + ret = HttpCreateHttpHandle(NULL, 0); +todo_wine + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected ret value %u.\n", ret); + + /* Non-zero reserved parameter is accepted on XP/2k3. */ + handle = NULL; + ret = HttpCreateHttpHandle(&handle, 0); +todo_wine { + ok(!ret, "Unexpected ret value %u.\n", ret); + ok(handle != NULL, "Unexpected handle value %p.\n", handle); +} + handle2 = NULL; + ret = HttpCreateHttpHandle(&handle2, 0); +todo_wine { + ok(!ret, "Unexpected ret value %u.\n", ret); + ok(handle2 != NULL && handle != handle2, "Unexpected handle %p.\n", handle2); +} + b = CloseHandle(handle); +todo_wine + ok(b, "Failed to close queue handle.\n"); +} + +static void test_HttpCreateServerSession(void) +{ + HTTP_SERVER_SESSION_ID session; + HTTPAPI_VERSION version; + ULONG ret; + + if (!pHttpCreateServerSession || !pHttpCloseServerSession) + { + skip("HttpCreateServerSession() is not supported.\n"); + return; + } + + version.HttpApiMajorVersion = 1; + version.HttpApiMinorVersion = 0; + ret = pHttpCreateServerSession(version, NULL, 0); + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret); + + version.HttpApiMajorVersion = 1; + version.HttpApiMinorVersion = 1; + ret = pHttpCreateServerSession(version, &session, 0); + ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret); + + version.HttpApiMajorVersion = 3; + version.HttpApiMinorVersion = 0; + ret = pHttpCreateServerSession(version, &session, 0); + ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret); + + version.HttpApiMajorVersion = 2; + version.HttpApiMinorVersion = 0; + ret = pHttpCreateServerSession(version, &session, 0); + ok(!ret, "Unexpected return value %u.\n", ret); + ret = pHttpCloseServerSession(session); + ok(!ret, "Unexpected return value %u.\n", ret); + + version.HttpApiMajorVersion = 1; + version.HttpApiMinorVersion = 0; + ret = pHttpCreateServerSession(version, &session, 0); + ok(!ret, "Unexpected return value %u.\n", ret); + ret = pHttpCloseServerSession(session); + ok(!ret, "Unexpected return value %u.\n", ret); + + ret = pHttpCloseServerSession(0xdead); + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret); +} + +static void test_HttpCreateUrlGroup(void) +{ + HTTP_SERVER_SESSION_ID session; + HTTP_URL_GROUP_ID group_id; + HTTPAPI_VERSION version; + ULONG ret; + + if (!pHttpCreateUrlGroup) + { + skip("HttpCreateUrlGroup is not supported.\n"); + return; + } + + group_id = 1; + ret = pHttpCreateUrlGroup(0, &group_id, 0); + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret); + ok(group_id == 1, "Unexpected group id %s.\n", wine_dbgstr_longlong(group_id)); + + /* Create session, url group, close session. */ + version.HttpApiMajorVersion = 1; + version.HttpApiMinorVersion = 0; + ret = pHttpCreateServerSession(version, &session, 0); + ok(!ret, "Unexpected return value %u.\n", ret); + + group_id = 0; + ret = pHttpCreateUrlGroup(session, &group_id, 0); + ok(!ret, "Unexpected return value %u.\n", ret); + ok(group_id != 0, "Unexpected group id %s.\n", wine_dbgstr_longlong(group_id)); + + ret = pHttpCloseServerSession(session); + ok(!ret, "Unexpected return value %u.\n", ret); + + /* Groups are closed together with their session. */ + ret = pHttpCloseUrlGroup(group_id); + ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret); + + /* Create session, url group, close group. */ + ret = pHttpCreateServerSession(version, &session, 0); + ok(!ret, "Unexpected return value %u.\n", ret); + + group_id = 0; + ret = pHttpCreateUrlGroup(session, &group_id, 0); + ok(!ret, "Unexpected return value %u.\n", ret); + ok(group_id != 0, "Unexpected group id %s.\n", wine_dbgstr_longlong(group_id)); + + ret = pHttpCloseUrlGroup(group_id); + ok(!ret, "Unexpected return value %u.\n", ret); + + ret = pHttpCloseServerSession(session); + ok(!ret, "Unexpected return value %u.\n", ret); +} + +START_TEST(httpapi) +{ + HTTPAPI_VERSION version = { 1, 0 }; + ULONG ret; + + init(); + + ret = HttpInitialize(version, HTTP_INITIALIZE_SERVER, NULL); + ok(!ret, "Failed to initialize library, ret %u.\n", ret); + + test_HttpCreateHttpHandle(); + test_HttpCreateServerSession(); + test_HttpCreateUrlGroup(); + + ret = HttpTerminate(HTTP_INITIALIZE_SERVER, NULL); + ok(!ret, "Failed to terminate, ret %u.\n", ret); +} diff --git a/include/http.h b/include/http.h index db8a3d4e90..b8ce811e01 100644 --- a/include/http.h +++ b/include/http.h @@ -52,6 +52,7 @@ typedef enum _HTTP_SERVICE_CONFIG_ID typedef ULONGLONG HTTP_OPAQUE_ID, *PHTTP_OPAQUE_ID; typedef HTTP_OPAQUE_ID HTTP_SERVER_SESSION_ID, *PHTTP_SERVER_SESSION_ID; +typedef HTTP_OPAQUE_ID HTTP_URL_GROUP_ID, *PHTTP_URL_GROUP_ID; ULONG WINAPI HttpInitialize(HTTPAPI_VERSION,ULONG,PVOID); ULONG WINAPI HttpTerminate(ULONG,PVOID); -- 2.15.0

1 0

[PATCH 01/11] ddraw: Cleanup ddraw_get_d3dcaps().
by Józef Kucia 04 Dec '17

04 Dec '17

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/ddraw/ddraw.c | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5f90a75c5849..d3e491c3e8bb 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1420,23 +1420,10 @@ HRESULT ddraw_get_d3dcaps(const struct ddraw *ddraw, D3DDEVICEDESC7 *caps) caps->dwMinTextureHeight = 1; /* Convert DWORDs safely to WORDs */ - if (wined3d_caps.MaxTextureBlendStages > 0xffff) - caps->wMaxTextureBlendStages = 0xffff; - else - caps->wMaxTextureBlendStages = (WORD)wined3d_caps.MaxTextureBlendStages; - if (wined3d_caps.MaxSimultaneousTextures > 0xffff) - caps->wMaxSimultaneousTextures = 0xffff; - else - caps->wMaxSimultaneousTextures = (WORD)wined3d_caps.MaxSimultaneousTextures; - - if (wined3d_caps.MaxUserClipPlanes > 0xffff) - caps->wMaxUserClipPlanes = 0xffff; - else - caps->wMaxUserClipPlanes = (WORD)wined3d_caps.MaxUserClipPlanes; - if (wined3d_caps.MaxVertexBlendMatrices > 0xffff) - caps->wMaxVertexBlendMatrices = 0xffff; - else - caps->wMaxVertexBlendMatrices = (WORD)wined3d_caps.MaxVertexBlendMatrices; + caps->wMaxTextureBlendStages = min(wined3d_caps.MaxTextureBlendStages, 0xffff); + caps->wMaxSimultaneousTextures = min(wined3d_caps.MaxSimultaneousTextures, 0xffff); + caps->wMaxUserClipPlanes = min(wined3d_caps.MaxUserClipPlanes, D3DMAXUSERCLIPPLANES); + caps->wMaxVertexBlendMatrices = min(wined3d_caps.MaxVertexBlendMatrices, 0xffff); caps->deviceGUID = IID_IDirect3DTnLHalDevice; -- 2.13.6

2 21

[PATCH 3/3] tzres: Add resource-only DLL for Time Zone names and use it.
by Akihiro Sagawa 03 Dec '17

03 Dec '17

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- configure | 2 + configure.ac | 1 + dlls/tzres/Makefile.in | 2 + dlls/tzres/tzres.rc | 245 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/tzres/tzres.spec | 1 + loader/wine.inf.in | 208 +++++++++++++++++++++++++++++++++++++++++ 6 files changed, 459 insertions(+) create mode 100644 dlls/tzres/Makefile.in create mode 100644 dlls/tzres/tzres.rc create mode 100644 dlls/tzres/tzres.spec

1 0

[PATCH 2/3] ntdll, kernel32: Use MUI strings when getting time zone name.
by Akihiro Sagawa 03 Dec '17

03 Dec '17

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/kernel32/kernel_private.h | 2 + dlls/kernel32/resource.c | 96 ++++++++++++++++++++++++++++++++++++++++++ dlls/kernel32/time.c | 47 +++++++++++++++++++-- dlls/ntdll/time.c | 8 +++- 4 files changed, 148 insertions(+), 5 deletions(-)

1 0

[PATCH 1/3] ntdll: Return correct time zone names for Asia/Tokyo and Asia/Yakutsk.
by Akihiro Sagawa 03 Dec '17

03 Dec '17

Without this change, for Japan, Wine returns "Korea Standard Time", not "Tokyo Standard Time" as seen in Bug 42719. Actually, this is a regression by d666143f880f9e19849f8f2b520dc059a11750d1. The new code relies on offsets from UTC and DST change timings. However, Northeast Asia regions don't use daylight saving time. Thus, Wine can't distinguish between these regions. This patch fixes the issue. Similar tasks are required for other regions, but will be deferred after Wine 3.0 release because we don't have related issues and need some more work to sort out common time zone names, e.g. "CST". Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/ntdll/time.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 53 insertions(+), 5 deletions(-)

1 0

[PATCH 13/13] reg: Recursively export all subkeys and data
by Hugh McMaster 03 Dec '17

03 Dec '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 33 +++++++++++++++++++++++++++++++-- programs/reg/reg.c | 2 +- programs/reg/reg.h | 1 + programs/reg/tests/reg.c | 4 ++-- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index b5662633a5..ac570a65b0 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -236,14 +236,18 @@ static void export_key_name(HANDLE hFile, WCHAR *name) heap_free(buf); } +#define MAX_SUBKEY_LEN 257 + static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) { LONG rc; DWORD max_value_len = 256, value_len; DWORD max_data_bytes = 2048, data_size; - DWORD i, type; - WCHAR *value_name; + DWORD subkey_len; + DWORD i, type, path_len; + WCHAR *value_name, *subkey_name, *subkey_path; BYTE *data; + HKEY subkey; export_key_name(hFile, path); @@ -280,6 +284,31 @@ static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) heap_free(data); heap_free(value_name); + + subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); + + path_len = lstrlenW(path); + + i = 0; + for (;;) + { + subkey_len = MAX_SUBKEY_LEN; + rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); + if (rc == ERROR_SUCCESS) + { + subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); + if (!RegOpenKeyExW(key, subkey_name, 0, KEY_READ, &subkey)) + { + export_registry_data(hFile, subkey, subkey_path); + RegCloseKey(subkey); + } + heap_free(subkey_path); + i++; + } + else break; + } + + heap_free(subkey_name); return 0; } diff --git a/programs/reg/reg.c b/programs/reg/reg.c index a3e2cf730a..33e381ce4a 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -637,7 +637,7 @@ static void output_value(const WCHAR *value_name, DWORD type, BYTE *data, DWORD output_string(newlineW); } -static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len) +WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len) { WCHAR *subkey_path; static const WCHAR fmt[] = {'%','s','\\','%','s',0}; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 35f22a5db6..2132e923de 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -31,6 +31,7 @@ void output_writeconsole(const WCHAR *str, DWORD wlen); void WINAPIV output_message(unsigned int id, ...); BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info); HKEY path_get_rootkey(const WCHAR *path); +WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len); BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key); /* import.c */ diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 1ec9ca0bd9..81c94955da 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4489,7 +4489,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", complex_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n"); err = delete_tree(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS, "delete_tree() failed: %d\n", err); @@ -4503,7 +4503,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", key_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); delete_key(hkey, "Subkey1"); delete_key(hkey, "Subkey2"); -- 2.15.0

1 0

[PATCH 12/13] reg: Export REG_DWORD values
by Hugh McMaster 03 Dec '17

03 Dec '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 15 +++++++++++++++ programs/reg/tests/reg.c | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 6e59ca4c8d..b5662633a5 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -118,6 +118,14 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) heap_free(str); } +static void export_dword_data(WCHAR **buf, DWORD *data) +{ + static const WCHAR fmt[] = {'d','w','o','r','d',':','%','0','8','x',0}; + + *buf = heap_xalloc(15 * sizeof(WCHAR)); + sprintfW(*buf, fmt, *data); +} + static size_t export_hex_data_type(HANDLE hFile, DWORD type) { static const WCHAR hex[] = {'h','e','x',':',0}; @@ -192,6 +200,13 @@ static void export_data(HANDLE hFile, WCHAR *value_name, DWORD value_len, case REG_SZ: export_string_data(&buf, data, size); break; + case REG_DWORD: + if (size) + { + export_dword_data(&buf, data); + break; + } + /* fall through */ case REG_NONE: case REG_EXPAND_SZ: case REG_BINARY: diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 88ec308954..1ec9ca0bd9 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4451,7 +4451,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", simple_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); /* Test registry export with a complex data structure */ add_key(hkey, "Subkey1", &subkey); @@ -4573,7 +4573,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", hex_types_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); } -- 2.15.0

1 0

[PATCH 11/13] reg: Export hex data types
by Hugh McMaster 03 Dec '17

03 Dec '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 79 +++++++++++++++++++++++++++++++++++++++++++----- programs/reg/tests/reg.c | 4 +-- 2 files changed, 73 insertions(+), 10 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index ff169637eb..6e59ca4c8d 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -20,12 +20,9 @@ #include <stdlib.h> #include <wine/unicode.h> -#include <wine/debug.h> #include "reg.h" -WINE_DEFAULT_DEBUG_CHANNEL(reg); - static void write_file(HANDLE hFile, const WCHAR *str) { DWORD written; @@ -121,6 +118,62 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) heap_free(str); } +static size_t export_hex_data_type(HANDLE hFile, DWORD type) +{ + static const WCHAR hex[] = {'h','e','x',':',0}; + static const WCHAR hexp_fmt[] = {'h','e','x','(','%','x',')',':',0}; + size_t line_len; + + if (type == REG_BINARY) + { + line_len = lstrlenW(hex); + write_file(hFile, hex); + } + else + { + WCHAR *buf = heap_xalloc(15 * sizeof(WCHAR)); + line_len = sprintfW(buf, hexp_fmt, type); + write_file(hFile, buf); + heap_free(buf); + } + + return line_len; +} + +#define MAX_HEX_CHARS 77 + +static void export_hex_data(HANDLE hFile, WCHAR **buf, DWORD type, + DWORD line_len, void *data, DWORD size) +{ + static const WCHAR fmt[] = {'%','0','2','x',0}; + static const WCHAR hex_concat[] = {'\\','\r','\n',' ',' ',0}; + size_t num_commas, i, pos; + + line_len += export_hex_data_type(hFile, type); + + if (!size) return; + + num_commas = size - 1; + *buf = heap_xalloc(size * 3 * sizeof(WCHAR)); + + for (i = 0, pos = 0; i < size; i++) + { + pos += sprintfW(*buf + pos, fmt, ((BYTE *)data)[i]); + if (i == num_commas) break; + (*buf)[pos++] = ','; + (*buf)[pos] = 0; + line_len += 3; + + if (line_len >= MAX_HEX_CHARS) + { + write_file(hFile, *buf); + write_file(hFile, hex_concat); + line_len = 2; + pos = 0; + } + } +} + static void export_newline(HANDLE hFile) { static const WCHAR newline[] = {'\r','\n',0}; @@ -132,17 +185,27 @@ static void export_data(HANDLE hFile, WCHAR *value_name, DWORD value_len, DWORD type, void *data, size_t size) { WCHAR *buf = NULL; + size_t line_len = export_value_name(hFile, value_name, value_len); - export_value_name(hFile, value_name, value_len); - - if (type == REG_SZ) + switch (type) { + case REG_SZ: export_string_data(&buf, data, size); + break; + case REG_NONE: + case REG_EXPAND_SZ: + case REG_BINARY: + case REG_MULTI_SZ: + default: + export_hex_data(hFile, &buf, type, line_len, data, size); + break; + } + + if (size || type == REG_SZ) + { write_file(hFile, buf); heap_free(buf); } - else - FIXME(": export of data type [0x%x] not yet implemented\n", type); export_newline(hFile); } diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index f1fa8e6ea5..88ec308954 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4536,7 +4536,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", empty_hex_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", empty_hex_test, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -4554,7 +4554,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", empty_hex_test2, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", empty_hex_test2, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); -- 2.15.0

1 0

[PATCH 10/13] reg: Export REG_SZ data
by Hugh McMaster 03 Dec '17

03 Dec '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 58 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index b94d79f27a..ff169637eb 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -107,6 +107,20 @@ static size_t export_value_name(HANDLE hFile, WCHAR *name, size_t len) return line_len; } +static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) +{ + size_t len = 0, line_len; + WCHAR *str; + static const WCHAR fmt[] = {'"','%','s','"',0}; + + if (size) + len = size / sizeof(WCHAR) - 1; + str = escape_string(data, len, &line_len); + *buf = heap_xalloc((line_len + 3) * sizeof(WCHAR)); + sprintfW(*buf, fmt, str); + heap_free(str); +} + static void export_newline(HANDLE hFile) { static const WCHAR newline[] = {'\r','\n',0}; @@ -114,6 +128,25 @@ static void export_newline(HANDLE hFile) write_file(hFile, newline); } +static void export_data(HANDLE hFile, WCHAR *value_name, DWORD value_len, + DWORD type, void *data, size_t size) +{ + WCHAR *buf = NULL; + + export_value_name(hFile, value_name, value_len); + + if (type == REG_SZ) + { + export_string_data(&buf, data, size); + write_file(hFile, buf); + heap_free(buf); + } + else + FIXME(": export of data type [0x%x] not yet implemented\n", type); + + export_newline(hFile); +} + static void export_key_name(HANDLE hFile, WCHAR *name) { static const WCHAR fmt[] = {'\r','\n','[','%','s',']','\r','\n',0}; @@ -129,34 +162,45 @@ static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) { LONG rc; DWORD max_value_len = 256, value_len; - DWORD i; + DWORD max_data_bytes = 2048, data_size; + DWORD i, type; WCHAR *value_name; + BYTE *data; export_key_name(hFile, path); value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); + data = heap_xalloc(max_data_bytes); i = 0; for (;;) { value_len = max_value_len; - rc = RegEnumValueW(key, i, value_name, &value_len, NULL, NULL, NULL, NULL); + data_size = max_data_bytes; + rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, data, &data_size); if (rc == ERROR_SUCCESS) { - export_value_name(hFile, value_name, value_len); - FIXME(": export of data types not yet implemented\n"); - export_newline(hFile); + export_data(hFile, value_name, value_len, type, data, data_size); i++; } else if (rc == ERROR_MORE_DATA) { - max_value_len *= 2; - value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); + if (data_size > max_data_bytes) + { + max_data_bytes = data_size; + data = heap_xrealloc(data, max_data_bytes); + } + else + { + max_value_len *= 2; + value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); + } } else break; } + heap_free(data); heap_free(value_name); return 0; } -- 2.15.0

1 0

[PATCH 09/13] reg: Export registry value names
by Hugh McMaster 03 Dec '17

03 Dec '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 124 +++++++++++++++++++++++++++++++++++++++++++++-- programs/reg/tests/reg.c | 20 ++++---- 2 files changed, 131 insertions(+), 13 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index f98ca1f89b..b94d79f27a 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -33,6 +33,87 @@ static void write_file(HANDLE hFile, const WCHAR *str) WriteFile(hFile, str, lstrlenW(str) * sizeof(WCHAR), &written, NULL); } +static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len) +{ + size_t i, escape_count, pos; + WCHAR *buf; + + for (i = 0, escape_count = 0; i < str_len; i++) + { + WCHAR c = str[i]; + if (c == '\r' || c == '\n' || c == '\\' || c == '"' || c == '\0') + escape_count++; + } + + buf = heap_xalloc((str_len + escape_count + 1) * sizeof(WCHAR)); + + for (i = 0, pos = 0; i < str_len; i++, pos++) + { + WCHAR c = str[i]; + + switch (c) + { + case '\r': + buf[pos++] = '\\'; + buf[pos] = 'r'; + break; + case '\n': + buf[pos++] = '\\'; + buf[pos] = 'n'; + break; + case '\\': + buf[pos++] = '\\'; + buf[pos] = '\\'; + break; + case '"': + buf[pos++] = '\\'; + buf[pos] = '"'; + break; + case '\0': + buf[pos++] = '\\'; + buf[pos] = '0'; + break; + default: + buf[pos] = c; + } + } + + buf[pos] = 0; + *line_len = pos; + return buf; +} + +static size_t export_value_name(HANDLE hFile, WCHAR *name, size_t len) +{ + static const WCHAR quoted_fmt[] = {'"','%','s','"','=',0}; + static const WCHAR default_name[] = {'@','=',0}; + size_t line_len; + + if (name && *name) + { + WCHAR *str = escape_string(name, len, &line_len); + WCHAR *buf = heap_xalloc((line_len + 4) * sizeof(WCHAR)); + line_len = sprintfW(buf, quoted_fmt, str); + write_file(hFile, buf); + heap_free(buf); + heap_free(str); + } + else + { + line_len = lstrlenW(default_name); + write_file(hFile, default_name); + } + + return line_len; +} + +static void export_newline(HANDLE hFile) +{ + static const WCHAR newline[] = {'\r','\n',0}; + + write_file(hFile, newline); +} + static void export_key_name(HANDLE hFile, WCHAR *name) { static const WCHAR fmt[] = {'\r','\n','[','%','s',']','\r','\n',0}; @@ -44,6 +125,42 @@ static void export_key_name(HANDLE hFile, WCHAR *name) heap_free(buf); } +static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) +{ + LONG rc; + DWORD max_value_len = 256, value_len; + DWORD i; + WCHAR *value_name; + + export_key_name(hFile, path); + + value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); + + i = 0; + for (;;) + { + value_len = max_value_len; + rc = RegEnumValueW(key, i, value_name, &value_len, NULL, NULL, NULL, NULL); + + if (rc == ERROR_SUCCESS) + { + export_value_name(hFile, value_name, value_len); + FIXME(": export of data types not yet implemented\n"); + export_newline(hFile); + i++; + } + else if (rc == ERROR_MORE_DATA) + { + max_value_len *= 2; + value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); + } + else break; + } + + heap_free(value_name); + return 0; +} + static void export_file_header(HANDLE hFile) { static const WCHAR header[] = { 0xfeff,'W','i','n','d','o','w','s',' ', @@ -108,6 +225,7 @@ int reg_export(int argc, WCHAR *argv[]) WCHAR *path, *long_key; BOOL overwrite_file = FALSE; HANDLE hFile; + int ret; if (argc == 3 || argc > 5) goto error; @@ -126,13 +244,13 @@ int reg_export(int argc, WCHAR *argv[]) hFile = get_file_handle(argv[3], overwrite_file); export_file_header(hFile); - export_key_name(hFile, long_key); - FIXME(": operation not yet implemented\n"); + ret = export_registry_data(hFile, hkey, long_key); + export_newline(hFile); CloseHandle(hFile); RegCloseKey(hkey); - return 1; + return ret; error: output_message(STRING_INVALID_SYNTAX); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 62299aa268..f1fa8e6ea5 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4422,7 +4422,7 @@ static void test_export(void) add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); os_version = GetVersion(); major_version = LOBYTE(LOWORD(os_version)); @@ -4437,12 +4437,12 @@ static void test_export(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); } else /* Windows XP (32-bit) and older */ win_skip("File overwrite flag [/y] not supported; skipping position tests\n"); - ok(compare_export("file.reg", empty_key_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); /* Test registry export with a simple data structure */ dword = 0x100; @@ -4450,7 +4450,7 @@ static void test_export(void) add_value(hkey, "String", REG_SZ, "Your text here...", 18); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", simple_test, TODO_REG_COMPARE), "compare_export() failed\n"); /* Test registry export with a complex data structure */ @@ -4488,7 +4488,7 @@ static void test_export(void) RegCloseKey(hkey); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", complex_test, TODO_REG_COMPARE), "compare_export() failed\n"); err = delete_tree(HKEY_CURRENT_USER, KEY_BASE); @@ -4502,7 +4502,7 @@ static void test_export(void) RegCloseKey(subkey); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", key_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(hkey, "Subkey1"); @@ -4517,7 +4517,7 @@ static void test_export(void) RegCloseKey(hkey); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", value_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -4535,7 +4535,7 @@ static void test_export(void) RegCloseKey(hkey); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -4553,7 +4553,7 @@ static void test_export(void) RegCloseKey(hkey); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test2, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -4572,7 +4572,7 @@ static void test_export(void) RegCloseKey(hkey); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", hex_types_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); -- 2.15.0

1 0

[PATCH 08/13] reg: Export the name of the specified registry key
by Hugh McMaster 03 Dec '17

03 Dec '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/programs/reg/export.c b/programs/reg/export.c index d34878b877..f98ca1f89b 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -33,6 +33,17 @@ static void write_file(HANDLE hFile, const WCHAR *str) WriteFile(hFile, str, lstrlenW(str) * sizeof(WCHAR), &written, NULL); } +static void export_key_name(HANDLE hFile, WCHAR *name) +{ + static const WCHAR fmt[] = {'\r','\n','[','%','s',']','\r','\n',0}; + WCHAR *buf; + + buf = heap_xalloc((lstrlenW(name) + 7) * sizeof(WCHAR)); + sprintfW(buf, fmt, name); + write_file(hFile, buf); + heap_free(buf); +} + static void export_file_header(HANDLE hFile) { static const WCHAR header[] = { 0xfeff,'W','i','n','d','o','w','s',' ', @@ -115,6 +126,7 @@ int reg_export(int argc, WCHAR *argv[]) hFile = get_file_handle(argv[3], overwrite_file); export_file_header(hFile); + export_key_name(hFile, long_key); FIXME(": operation not yet implemented\n"); CloseHandle(hFile); -- 2.15.0

1 0

[PATCH 07/13] reg: Export the registry file header
by Hugh McMaster 03 Dec '17

03 Dec '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/programs/reg/export.c b/programs/reg/export.c index 81ffd220a3..d34878b877 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -26,6 +26,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); +static void write_file(HANDLE hFile, const WCHAR *str) +{ + DWORD written; + + WriteFile(hFile, str, lstrlenW(str) * sizeof(WCHAR), &written, NULL); +} + +static void export_file_header(HANDLE hFile) +{ + static const WCHAR header[] = { 0xfeff,'W','i','n','d','o','w','s',' ', + 'R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ', + 'V','e','r','s','i','o','n',' ','5','.','0','0','\r','\n'}; + + write_file(hFile, header); +} + static HANDLE create_file(const WCHAR *filename, DWORD action) { return CreateFileW(filename, GENERIC_WRITE, 0, NULL, action, FILE_ATTRIBUTE_NORMAL, NULL); @@ -98,6 +114,7 @@ int reg_export(int argc, WCHAR *argv[]) } hFile = get_file_handle(argv[3], overwrite_file); + export_file_header(hFile); FIXME(": operation not yet implemented\n"); CloseHandle(hFile); -- 2.15.0

1 0

[PATCH 06/13] reg: Prompt the user to overwrite the export file if it already exists
by Hugh McMaster 03 Dec '17

03 Dec '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- programs/reg/reg.c | 4 ++-- programs/reg/reg.h | 2 ++ programs/reg/reg.rc | 1 + programs/reg/resource.h | 1 + programs/reg/tests/reg.c | 18 +++++++++--------- 6 files changed, 59 insertions(+), 12 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 9d0d33274e..81ffd220a3 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -17,6 +17,7 @@ */ #include <windows.h> +#include <stdlib.h> #include <wine/unicode.h> #include <wine/debug.h> @@ -25,6 +26,44 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); +static HANDLE create_file(const WCHAR *filename, DWORD action) +{ + return CreateFileW(filename, GENERIC_WRITE, 0, NULL, action, FILE_ATTRIBUTE_NORMAL, NULL); +} + +static HANDLE get_file_handle(WCHAR *filename, BOOL overwrite_file) +{ + HANDLE hFile = create_file(filename, overwrite_file ? CREATE_ALWAYS : CREATE_NEW); + + if (hFile == INVALID_HANDLE_VALUE) + { + DWORD error = GetLastError(); + + if (error == ERROR_FILE_EXISTS) + { + if (!ask_confirm(STRING_OVERWRITE_FILE, filename)) + { + output_message(STRING_CANCELLED); + exit(0); + } + + hFile = create_file(filename, CREATE_ALWAYS); + } + else + { + WCHAR *str; + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, NULL, error, 0, (WCHAR *)&str, 0, NULL); + output_writeconsole(str, lstrlenW(str)); + LocalFree(str); + exit(1); + } + } + + return hFile; +} + static BOOL is_overwrite_switch(const WCHAR *s) { if (strlenW(s) > 2) @@ -40,6 +79,8 @@ int reg_export(int argc, WCHAR *argv[]) { HKEY root, hkey; WCHAR *path, *long_key; + BOOL overwrite_file = FALSE; + HANDLE hFile; if (argc == 3 || argc > 5) goto error; @@ -47,7 +88,7 @@ int reg_export(int argc, WCHAR *argv[]) if (!parse_registry_key(argv[2], &root, &path, &long_key)) return 1; - if (argc == 5 && !is_overwrite_switch(argv[4])) + if (argc == 5 && !(overwrite_file = is_overwrite_switch(argv[4]))) goto error; if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey)) @@ -56,7 +97,9 @@ int reg_export(int argc, WCHAR *argv[]) return 1; } + hFile = get_file_handle(argv[3], overwrite_file); FIXME(": operation not yet implemented\n"); + CloseHandle(hFile); RegCloseKey(hkey); diff --git a/programs/reg/reg.c b/programs/reg/reg.c index e26928470e..a3e2cf730a 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -111,7 +111,7 @@ BOOL heap_free(void *buf) return HeapFree(GetProcessHeap(), 0, buf); } -static void output_writeconsole(const WCHAR *str, DWORD wlen) +void output_writeconsole(const WCHAR *str, DWORD wlen) { DWORD count, ret; @@ -176,7 +176,7 @@ static void WINAPIV output_string(const WCHAR *fmt, ...) } /* ask_confirm() adapted from programs/cmd/builtins.c */ -static BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info) +BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info) { HMODULE hmod; WCHAR Ybuffer[4]; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 3b5ab86ff9..35f22a5db6 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -27,7 +27,9 @@ void *heap_xalloc(size_t size); void *heap_xrealloc(void *buf, size_t size); BOOL heap_free(void *buf); +void output_writeconsole(const WCHAR *str, DWORD wlen); void WINAPIV output_message(unsigned int id, ...); +BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info); HKEY path_get_rootkey(const WCHAR *path); BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key); diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index 2ac0b22809..9d8cb882c7 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -68,4 +68,5 @@ STRINGTABLE STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" + STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" } diff --git a/programs/reg/resource.h b/programs/reg/resource.h index aef2ca9738..518f92ceac 100644 --- a/programs/reg/resource.h +++ b/programs/reg/resource.h @@ -58,3 +58,4 @@ #define STRING_ESCAPE_SEQUENCE 135 #define STRING_EXPORT_USAGE 136 #define STRING_INVALID_SYSTEM_KEY 137 +#define STRING_OVERWRITE_FILE 138 diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 9e4a8145a6..62299aa268 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4289,7 +4289,7 @@ static BOOL compare_export_(unsigned line, const char *filename, const char *exp lok(!lstrcmpW(fbuf, wstr), "export data does not match expected data\n"); ret = DeleteFileA(filename); - todo_wine lok(ret, "DeleteFile failed: %u\n", GetLastError()); + lok(ret, "DeleteFile failed: %u\n", GetLastError()); exit: HeapFree(GetProcessHeap(), 0, fbuf); @@ -4442,7 +4442,7 @@ static void test_export(void) else /* Windows XP (32-bit) and older */ win_skip("File overwrite flag [/y] not supported; skipping position tests\n"); - todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", empty_key_test, TODO_REG_COMPARE), "compare_export() failed\n"); /* Test registry export with a simple data structure */ dword = 0x100; @@ -4451,7 +4451,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", simple_test, TODO_REG_COMPARE), "compare_export() failed\n"); /* Test registry export with a complex data structure */ add_key(hkey, "Subkey1", &subkey); @@ -4489,7 +4489,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", complex_test, TODO_REG_COMPARE), "compare_export() failed\n"); err = delete_tree(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS, "delete_tree() failed: %d\n", err); @@ -4503,7 +4503,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", key_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(hkey, "Subkey1"); delete_key(hkey, "Subkey2"); @@ -4518,7 +4518,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", value_order_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", value_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -4536,7 +4536,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", empty_hex_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", empty_hex_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -4554,7 +4554,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", empty_hex_test2, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", empty_hex_test2, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -4573,7 +4573,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", hex_types_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); } -- 2.15.0

1 0

[PATCH 05/13] reg: Validate the registry key before commencing the export operation
by Hugh McMaster 03 Dec '17

03 Dec '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 720b9ef703..9d0d33274e 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -38,7 +38,7 @@ static BOOL is_overwrite_switch(const WCHAR *s) int reg_export(int argc, WCHAR *argv[]) { - HKEY root; + HKEY root, hkey; WCHAR *path, *long_key; if (argc == 3 || argc > 5) @@ -50,7 +50,16 @@ int reg_export(int argc, WCHAR *argv[]) if (argc == 5 && !is_overwrite_switch(argv[4])) goto error; + if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey)) + { + output_message(STRING_INVALID_KEY); + return 1; + } + FIXME(": operation not yet implemented\n"); + + RegCloseKey(hkey); + return 1; error: -- 2.15.0

1 0

[PATCH 04/13] reg: Print a more informative error message if the system key is invalid
by Hugh McMaster 03 Dec '17

03 Dec '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/reg.c | 9 +++--- programs/reg/reg.rc | 1 + programs/reg/resource.h | 73 +++++++++++++++++++++++++------------------------ 3 files changed, 43 insertions(+), 40 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index a65bfc8d05..e26928470e 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -878,16 +878,17 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long if (!sane_path(key)) return FALSE; + *path = strchrW(key, '\\'); + if (*path) (*path)++; + *root = path_get_rootkey(key); if (!*root) { - output_message(STRING_INVALID_KEY); + if (*path) *(*path - 1) = 0; + output_message(STRING_INVALID_SYSTEM_KEY, key); return FALSE; } - *path = strchrW(key, '\\'); - if (*path) (*path)++; - *long_key = get_long_key(*root, *path); return TRUE; diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index 1647e222fa..2ac0b22809 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -67,4 +67,5 @@ STRINGTABLE STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" + STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" } diff --git a/programs/reg/resource.h b/programs/reg/resource.h index 8441638657..aef2ca9738 100644 --- a/programs/reg/resource.h +++ b/programs/reg/resource.h @@ -21,39 +21,40 @@ #include <windef.h> /* Translation IDs. */ -#define STRING_USAGE 101 -#define STRING_ADD_USAGE 102 -#define STRING_DELETE_USAGE 103 -#define STRING_QUERY_USAGE 104 -#define STRING_SUCCESS 105 -#define STRING_INVALID_KEY 106 -#define STRING_INVALID_CMDLINE 107 -#define STRING_NO_REMOTE 108 -#define STRING_CANNOT_FIND 109 -#define STRING_UNSUPPORTED_TYPE 110 -#define STRING_MISSING_INTEGER 111 -#define STRING_MISSING_HEXDATA 112 -#define STRING_UNHANDLED_TYPE 113 -#define STRING_OVERWRITE_VALUE 114 -#define STRING_YESNO 115 -#define STRING_YES 116 -#define STRING_NO 117 -#define STRING_CANCELLED 118 -#define STRING_DEFAULT_VALUE 119 -#define STRING_DELETE_VALUE 120 -#define STRING_DELETE_VALUEALL 121 -#define STRING_DELETE_SUBKEY 122 -#define STRING_INVALID_STRING 123 -#define STRING_VALUEALL_FAILED 124 -#define STRING_GENERAL_FAILURE 125 -#define STRING_MATCHES_FOUND 126 -#define STRING_INVALID_SYNTAX 127 -#define STRING_INVALID_OPTION 128 -#define STRING_REG_HELP 129 -#define STRING_FUNC_HELP 130 -#define STRING_VALUE_NOT_SET 131 -#define STRING_IMPORT_USAGE 132 -#define STRING_FILE_NOT_FOUND 133 -#define STRING_OPEN_KEY_FAILED 134 -#define STRING_ESCAPE_SEQUENCE 135 -#define STRING_EXPORT_USAGE 136 +#define STRING_USAGE 101 +#define STRING_ADD_USAGE 102 +#define STRING_DELETE_USAGE 103 +#define STRING_QUERY_USAGE 104 +#define STRING_SUCCESS 105 +#define STRING_INVALID_KEY 106 +#define STRING_INVALID_CMDLINE 107 +#define STRING_NO_REMOTE 108 +#define STRING_CANNOT_FIND 109 +#define STRING_UNSUPPORTED_TYPE 110 +#define STRING_MISSING_INTEGER 111 +#define STRING_MISSING_HEXDATA 112 +#define STRING_UNHANDLED_TYPE 113 +#define STRING_OVERWRITE_VALUE 114 +#define STRING_YESNO 115 +#define STRING_YES 116 +#define STRING_NO 117 +#define STRING_CANCELLED 118 +#define STRING_DEFAULT_VALUE 119 +#define STRING_DELETE_VALUE 120 +#define STRING_DELETE_VALUEALL 121 +#define STRING_DELETE_SUBKEY 122 +#define STRING_INVALID_STRING 123 +#define STRING_VALUEALL_FAILED 124 +#define STRING_GENERAL_FAILURE 125 +#define STRING_MATCHES_FOUND 126 +#define STRING_INVALID_SYNTAX 127 +#define STRING_INVALID_OPTION 128 +#define STRING_REG_HELP 129 +#define STRING_FUNC_HELP 130 +#define STRING_VALUE_NOT_SET 131 +#define STRING_IMPORT_USAGE 132 +#define STRING_FILE_NOT_FOUND 133 +#define STRING_OPEN_KEY_FAILED 134 +#define STRING_ESCAPE_SEQUENCE 135 +#define STRING_EXPORT_USAGE 136 +#define STRING_INVALID_SYSTEM_KEY 137 -- 2.15.0

1 0

[PATCH 03/13] reg: Validate the system key before commencing the export operation
by Hugh McMaster 03 Dec '17

03 Dec '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 6 ++++++ programs/reg/reg.c | 2 +- programs/reg/reg.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 530d11b707..720b9ef703 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -38,9 +38,15 @@ static BOOL is_overwrite_switch(const WCHAR *s) int reg_export(int argc, WCHAR *argv[]) { + HKEY root; + WCHAR *path, *long_key; + if (argc == 3 || argc > 5) goto error; + if (!parse_registry_key(argv[2], &root, &path, &long_key)) + return 1; + if (argc == 5 && !is_overwrite_switch(argv[4])) goto error; diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 7affdd282b..a65bfc8d05 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -873,7 +873,7 @@ static WCHAR *get_long_key(HKEY root, WCHAR *path) return long_key; } -static BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key) +BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key) { if (!sane_path(key)) return FALSE; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index b4751e408c..3b5ab86ff9 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -29,6 +29,7 @@ void *heap_xrealloc(void *buf, size_t size); BOOL heap_free(void *buf); void WINAPIV output_message(unsigned int id, ...); HKEY path_get_rootkey(const WCHAR *path); +BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key); /* import.c */ int reg_import(const WCHAR *filename); -- 2.15.0

1 0

[PATCH 02/13] reg: Add basic syntax checks for the export operation
by Hugh McMaster 03 Dec '17

03 Dec '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/programs/reg/export.c b/programs/reg/export.c index f4318eff72..530d11b707 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -18,12 +18,37 @@ #include <windows.h> +#include <wine/unicode.h> #include <wine/debug.h> +#include "reg.h" + WINE_DEFAULT_DEBUG_CHANNEL(reg); +static BOOL is_overwrite_switch(const WCHAR *s) +{ + if (strlenW(s) > 2) + return FALSE; + + if ((s[0] == '/' || s[0] == '-') && (s[1] == 'y' || s[1] == 'Y')) + return TRUE; + + return FALSE; +} + int reg_export(int argc, WCHAR *argv[]) { + if (argc == 3 || argc > 5) + goto error; + + if (argc == 5 && !is_overwrite_switch(argv[4])) + goto error; + FIXME(": operation not yet implemented\n"); return 1; + +error: + output_message(STRING_INVALID_SYNTAX); + output_message(STRING_FUNC_HELP, struprW(argv[1])); + return 1; } -- 2.15.0

1 0

[PATCH 01/13] reg: Add initial support for the export operation
by Hugh McMaster 03 Dec '17

03 Dec '17

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/Makefile.in | 1 + programs/reg/export.c | 29 +++++++++++++++++++++++++++++ programs/reg/reg.c | 6 ++++++ programs/reg/reg.h | 3 +++ programs/reg/reg.rc | 3 ++- programs/reg/resource.h | 1 + programs/reg/tests/reg.c | 2 +- 7 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 programs/reg/export.c diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 256bcde62b..7c6a899362 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = advapi32 DELAYIMPORTS = user32 C_SRCS = \ + export.c \ import.c \ reg.c diff --git a/programs/reg/export.c b/programs/reg/export.c new file mode 100644 index 0000000000..f4318eff72 --- /dev/null +++ b/programs/reg/export.c @@ -0,0 +1,29 @@ +/* + * Copyright 2017 Hugh McMaster + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(reg); + +int reg_export(int argc, WCHAR *argv[]) +{ + FIXME(": operation not yet implemented\n"); + return 1; +} diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 42fd6e9daa..7affdd282b 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -908,6 +908,7 @@ enum operations { REG_ADD, REG_DELETE, REG_IMPORT, + REG_EXPORT, REG_QUERY, REG_INVALID }; @@ -919,6 +920,7 @@ static enum operations get_operation(const WCHAR *str, int *op_help) static const WCHAR add[] = {'a','d','d',0}; static const WCHAR delete[] = {'d','e','l','e','t','e',0}; static const WCHAR import[] = {'i','m','p','o','r','t',0}; + static const WCHAR export[] = {'e','x','p','o','r','t',0}; static const WCHAR query[] = {'q','u','e','r','y',0}; static const struct op_info op_array[] = @@ -926,6 +928,7 @@ static enum operations get_operation(const WCHAR *str, int *op_help) { add, REG_ADD, STRING_ADD_USAGE }, { delete, REG_DELETE, STRING_DELETE_USAGE }, { import, REG_IMPORT, STRING_IMPORT_USAGE }, + { export, REG_EXPORT, STRING_EXPORT_USAGE }, { query, REG_QUERY, STRING_QUERY_USAGE }, { NULL, -1, 0 } }; @@ -994,6 +997,9 @@ int wmain(int argc, WCHAR *argvW[]) if (op == REG_IMPORT) return reg_import(argvW[2]); + if (op == REG_EXPORT) + return reg_export(argc, argvW); + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) return 1; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 07bbecf8d5..b4751e408c 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -33,4 +33,7 @@ HKEY path_get_rootkey(const WCHAR *path); /* import.c */ int reg_import(const WCHAR *filename); +/* export.c */ +int reg_export(int argc, WCHAR *argv[]); + #endif /* __REG_H__ */ diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index 9a00cc1c57..1647e222fa 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -29,7 +29,7 @@ STRINGTABLE STRING_USAGE, "Usage:\n\ \ REG [operation] [parameters]\n\n\ \Supported operations:\n\ -\ ADD | DELETE | IMPORT | QUERY\n\n\ +\ ADD | DELETE | IMPORT | EXPORT | QUERY\n\n\ \For help on a specific operation, type:\n\ \ REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" @@ -66,4 +66,5 @@ STRINGTABLE STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" + STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" } diff --git a/programs/reg/resource.h b/programs/reg/resource.h index 1f2c150d63..8441638657 100644 --- a/programs/reg/resource.h +++ b/programs/reg/resource.h @@ -56,3 +56,4 @@ #define STRING_FILE_NOT_FOUND 133 #define STRING_OPEN_KEY_FAILED 134 #define STRING_ESCAPE_SEQUENCE 135 +#define STRING_EXPORT_USAGE 136 diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0bab8bc2af..9e4a8145a6 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4389,7 +4389,7 @@ static void test_export(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg export /?", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg export \\\\remote-pc\\HKLM\\Wine file.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); -- 2.15.0

1 0

[PATCH 01/29] ANNOUNCE: move WineHQ URLs to https
by Austin English 02 Dec '17

02 Dec '17

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- ANNOUNCE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 16368ac168..6450ac35d5 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -10,17 +10,17 @@ What's new in this release (see below for details): The source is available from the following locations: - http://dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz + https://dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz http://mirrors.ibiblio.org/wine/source/2.x/wine-2.22.tar.xz Binary packages for various distributions will be available from: - http://www.winehq.org/download + https://www.winehq.org/download -You will find documentation on http://www.winehq.org/documentation +You will find documentation on https://www.winehq.org/documentation You can also get the current source directly from the git -repository. Check http://www.winehq.org/git for details. +repository. Check https://wiki.winehq.org/Git_Wine_Tutorial for details. Wine is available thanks to the work of many people. See the file AUTHORS in the distribution for the complete list. -- 2.13.6

2 31

[PATCH 1/3] shell32: Implement the ReplaceItem() command for Progman DDE.
by Zebediah Figura 02 Dec '17

02 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/shell32/dde.c | 3 ++- dlls/shell32/tests/progman_dde.c | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 7505c2c..8ac6f9c 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -127,6 +127,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) static const WCHAR show_groupW[] = {'S','h','o','w','G','r','o','u','p',0}; static const WCHAR add_itemW[] = {'A','d','d','I','t','e','m',0}; static const WCHAR delete_itemW[] = {'D','e','l','e','t','e','I','t','e','m',0}; + static const WCHAR replace_itemW[] = {'R','e','p','l','a','c','e','I','t','e','m',0}; static const WCHAR dotexeW[] = {'.','e','x','e',0}; static const WCHAR dotlnkW[] = {'.','l','n','k',0}; @@ -255,7 +256,7 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) if (FAILED(hres)) return DDE_FNOTPROCESSED; } - else if (!strcmpiW(command, delete_itemW)) + else if (!strcmpiW(command, delete_itemW) || !strcmpiW(command, replace_itemW)) { WCHAR *name; BOOL ret; diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 478b3e6..dd9b777 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -325,6 +325,18 @@ static void test_progman_dde(DWORD instance, HCONV hConv) ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(!check_exists("Group1/test1.lnk"), "link should not exist\n"); + error = dde_execute(instance, hConv, "[AddItem(notepad,test1)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group1/test1.lnk"), "link not created\n"); + + error = dde_execute(instance, hConv, "[ReplaceItem(test1)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(!check_exists("Group1/test1.lnk"), "link should not exist\n"); + + error = dde_execute(instance, hConv, "[AddItem(regedit)]"); + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group1/regedit.lnk"), "link not created\n"); + /* test ShowGroup() and test which group an item gets added to */ error = dde_execute(instance, hConv, "[ShowGroup(Group1)]"); ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error); -- 2.7.4

1 2

[PATCH 1/4] shell32/tests: Simplify and standardize test structure for progman_dde.
by Zebediah Figura 01 Dec '17

01 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/shell32/tests/progman_dde.c | 577 ++++++++++----------------------------- 1 file changed, 138 insertions(+), 439 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 6e1378f..6be7267 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -34,25 +34,6 @@ #include "winuser.h" #include "shlobj.h" -/* Timeout on DdeClientTransaction Call */ -#define MS_TIMEOUT_VAL 1000 -/* # of times to poll for window creation */ -#define PDDE_POLL_NUM 150 -/* time to sleep between polls */ -#define PDDE_POLL_TIME 300 - -/* Call Info */ -#define DDE_TEST_MISC 0x00010000 -#define DDE_TEST_CREATEGROUP 0x00020000 -#define DDE_TEST_DELETEGROUP 0x00030000 -#define DDE_TEST_SHOWGROUP 0x00040000 -#define DDE_TEST_ADDITEM 0x00050000 -#define DDE_TEST_DELETEITEM 0x00060000 -#define DDE_TEST_COMPOUND 0x00070000 -#define DDE_TEST_CALLMASK 0x00ff0000 - -#define DDE_TEST_NUMMASK 0x0000ffff - static HRESULT (WINAPI *pSHGetLocalizedName)(LPCWSTR, LPWSTR, UINT, int *); static BOOL (WINAPI *pSHGetSpecialFolderPathA)(HWND, LPSTR, int, BOOL); static BOOL (WINAPI *pReadCabinetState)(CABINETSTATE *, int); @@ -231,411 +212,64 @@ static HDDEDATA CALLBACK DdeCallback(UINT type, UINT format, HCONV hConv, HSZ hs return NULL; } -/* - * Encoded String for Error Messages so that inner failures can determine - * what test is failing. Format is: [Code:TestNum] - */ -static const char * GetStringFromTestParams(int testParams) -{ - int testNum; - static char testParamString[64]; - const char *callId; - - testNum = testParams & DDE_TEST_NUMMASK; - switch (testParams & DDE_TEST_CALLMASK) - { - default: - case DDE_TEST_MISC: - callId = "MISC"; - break; - case DDE_TEST_CREATEGROUP: - callId = "C_G"; - break; - case DDE_TEST_DELETEGROUP: - callId = "D_G"; - break; - case DDE_TEST_SHOWGROUP: - callId = "S_G"; - break; - case DDE_TEST_ADDITEM: - callId = "A_I"; - break; - case DDE_TEST_DELETEITEM: - callId = "D_I"; - break; - case DDE_TEST_COMPOUND: - callId = "CPD"; - break; - } - - sprintf(testParamString, " [%s:%i]", callId, testNum); - return testParamString; -} - -/* Transfer DMLERR's into text readable strings for Error Messages */ -#define DMLERR_TO_STR(x) case x: return#x; -static const char * GetStringFromError(UINT err) +static UINT dde_execute(DWORD instance, HCONV hconv, const char *command_str) { - switch (err) - { - DMLERR_TO_STR(DMLERR_NO_ERROR); - DMLERR_TO_STR(DMLERR_ADVACKTIMEOUT); - DMLERR_TO_STR(DMLERR_BUSY); - DMLERR_TO_STR(DMLERR_DATAACKTIMEOUT); - DMLERR_TO_STR(DMLERR_DLL_NOT_INITIALIZED); - DMLERR_TO_STR(DMLERR_DLL_USAGE); - DMLERR_TO_STR(DMLERR_EXECACKTIMEOUT); - DMLERR_TO_STR(DMLERR_INVALIDPARAMETER); - DMLERR_TO_STR(DMLERR_LOW_MEMORY); - DMLERR_TO_STR(DMLERR_MEMORY_ERROR); - DMLERR_TO_STR(DMLERR_NOTPROCESSED); - DMLERR_TO_STR(DMLERR_NO_CONV_ESTABLISHED); - DMLERR_TO_STR(DMLERR_POKEACKTIMEOUT); - DMLERR_TO_STR(DMLERR_POSTMSG_FAILED); - DMLERR_TO_STR(DMLERR_REENTRANCY); - DMLERR_TO_STR(DMLERR_SERVER_DIED); - DMLERR_TO_STR(DMLERR_SYS_ERROR); - DMLERR_TO_STR(DMLERR_UNADVACKTIMEOUT); - DMLERR_TO_STR(DMLERR_UNFOUND_QUEUE_ID); - default: - return "Unknown DML Error"; - } -} + HDDEDATA command, hdata; + DWORD result; + UINT ret; -/* Helper Function to Transfer DdeGetLastError into a String */ -static const char * GetDdeLastErrorStr(DWORD instance) -{ - UINT err = DdeGetLastError(instance); + command = DdeCreateDataHandle(instance, (BYTE *)command_str, strlen(command_str)+1, 0, 0, 0, 0); + ok(command != NULL, "DdeCreateDataHandle() failed: %u\n", DdeGetLastError(instance)); - return GetStringFromError(err); -} + hdata = DdeClientTransaction((BYTE *)command, -1, hconv, 0, 0, XTYP_EXECUTE, 2000, &result); + ret = DdeGetLastError(instance); + /* PROGMAN always returns 1 on success */ + ok((UINT)hdata == !ret, "expected %o, got %p\n", !ret, hdata); -/* Execute a Dde Command and return the error & result */ -/* Note: Progman DDE always returns a pointer to 0x00000001 on a successful result */ -static void DdeExecuteCommand(DWORD instance, HCONV hConv, const char *strCmd, HDDEDATA *hData, UINT *err, int testParams) -{ - HDDEDATA command; - - command = DdeCreateDataHandle(instance, (LPBYTE) strCmd, strlen(strCmd)+1, 0, 0L, 0, 0); - ok (command != NULL, "DdeCreateDataHandle Error %s.%s\n", - GetDdeLastErrorStr(instance), GetStringFromTestParams(testParams)); - *hData = DdeClientTransaction((void *) command, - -1, - hConv, - 0, - 0, - XTYP_EXECUTE, - MS_TIMEOUT_VAL, - NULL); - - /* hData is technically a pointer, but for Program Manager, - * it is NULL (error) or 1 (success) - * TODO: Check other versions of Windows to verify 1 is returned. - * While it is unlikely that anyone is actually testing that the result is 1 - * if all versions of windows return 1, Wine should also. - */ - if (*hData == NULL) - { - *err = DdeGetLastError(instance); - } - else - { - *err = DMLERR_NO_ERROR; - todo_wine - { - ok(*hData == (HDDEDATA) 1, "Expected HDDEDATA Handle == 1, actually %p.%s\n", - *hData, GetStringFromTestParams(testParams)); - } - } - DdeFreeDataHandle(command); + return ret; } -/* - * Check if Window is onscreen with the appropriate name. - * - * Windows are not created synchronously. So we do not know - * when and if the window will be created/shown on screen. - * This function implements a polling mechanism to determine - * creation. - * A more complicated method would be to use SetWindowsHookEx. - * Since polling worked fine in my testing, no reason to implement - * the other. Comments about other methods of determining when - * window creation happened were not encouraging (not including - * SetWindowsHookEx). - */ -static HWND CheckWindowCreated(const char *winName, BOOL closeWindow, int testParams) +static BOOL check_window_exists(const char *name) { HWND window = NULL; int i; - /* Poll for Window Creation */ - for (i = 0; window == NULL && i < PDDE_POLL_NUM; i++) - { - Sleep(PDDE_POLL_TIME); - /* Specify the window class name to make sure what we find is really an - * Explorer window. Explorer used two different window classes so try - * both. - */ - window = FindWindowA("ExplorerWClass", winName); - if (!window) - window = FindWindowA("CabinetWClass", winName); - } - ok (window != NULL, "Window \"%s\" was not created in %i seconds - assumed failure.%s\n", - winName, PDDE_POLL_NUM*PDDE_POLL_TIME/1000, GetStringFromTestParams(testParams)); - - /* Close Window as desired. */ - if (window != NULL && closeWindow) - { - SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); - window = NULL; - } - return window; -} - -/* Check for Existence (or non-existence) of a file or group - * When testing for existence of a group, groupName is not needed - */ -static void CheckFileExistsInProgramGroups(const char *nameToCheck, BOOL shouldExist, BOOL isGroup, - const char *groupName, int testParams) -{ - char path[MAX_PATH]; - DWORD attributes; - int len; - - lstrcpyA(path, ProgramsDir); - - len = strlen(path) + strlen(nameToCheck)+1; - if (groupName != NULL) + for (i = 0; i < 20; i++) { - len += strlen(groupName)+1; - } - ok (len <= MAX_PATH, "Path Too Long.%s\n", GetStringFromTestParams(testParams)); - if (len <= MAX_PATH) - { - if (groupName != NULL) - { - strcat(path, "\\"); - strcat(path, groupName); - } - strcat(path, "\\"); - strcat(path, nameToCheck); - attributes = GetFileAttributesA(path); - if (!shouldExist) + Sleep(100); + if ((window = FindWindowA("ExplorerWClass", name)) || + (window = FindWindowA("CabinetWClass", name))) { - ok (attributes == INVALID_FILE_ATTRIBUTES , "File exists and shouldn't %s.%s\n", - path, GetStringFromTestParams(testParams)); - } else { - if (attributes == INVALID_FILE_ATTRIBUTES) - { - ok (FALSE, "Created File %s doesn't exist.%s\n", path, GetStringFromTestParams(testParams)); - } else if (isGroup) { - ok (attributes & FILE_ATTRIBUTE_DIRECTORY, "%s is not a folder (attr=%x).%s\n", - path, attributes, GetStringFromTestParams(testParams)); - } else { - ok (attributes & FILE_ATTRIBUTE_ARCHIVE, "Created File %s has wrong attributes (%x).%s\n", - path, attributes, GetStringFromTestParams(testParams)); - } + SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); + break; } } -} - -/* Create Group Test. - * command and expected_result. - * if expected_result is DMLERR_NO_ERROR, test - * 1. group was created - * 2. window is open - */ -static void CreateGroupTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, - const char *groupName, const char *windowTitle, int testParams) -{ - HDDEDATA hData; - UINT error; - - /* Execute Command & Check Result */ - DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); - todo_wine - { - ok (expected_result == error, "CreateGroup %s: Expected Error %s, received %s.%s\n", - groupName, GetStringFromError(expected_result), GetStringFromError(error), - GetStringFromTestParams(testParams)); - } - - /* No Error */ - if (error == DMLERR_NO_ERROR) - { - - /* Check if Group Now Exists */ - CheckFileExistsInProgramGroups(groupName, TRUE, TRUE, NULL, testParams); - /* Check if Window is Open (polling) */ - CheckWindowCreated(windowTitle, TRUE, testParams); - } -} - -/* Show Group Test. - * DDE command, expected_result, and the group name to check for existence - * if expected_result is DMLERR_NO_ERROR, test - * 1. window is open - */ -static HWND ShowGroupTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, - const char *groupName, const char *windowTitle, BOOL closeAfterShowing, int testParams) -{ - HDDEDATA hData; - UINT error; - HWND hwnd = 0; - - DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); -/* todo_wine... Is expected to fail, wine stubbed functions DO fail */ -/* TODO REMOVE THIS CODE!!! */ - todo_wine_if (expected_result != DMLERR_NOTPROCESSED) - ok (expected_result == error, "ShowGroup %s: Expected Error %s, received %s.%s\n", - groupName, GetStringFromError(expected_result), GetStringFromError(error), - GetStringFromTestParams(testParams)); - if (error == DMLERR_NO_ERROR) - { - /* Check if Window is Open (polling) */ - hwnd = CheckWindowCreated(windowTitle, closeAfterShowing, testParams); - } - return hwnd; + return (window != NULL); } -/* Delete Group Test. - * DDE command, expected_result, and the group name to check for existence - * if expected_result is DMLERR_NO_ERROR, test - * 1. group does not exist - */ -static void DeleteGroupTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, - const char *groupName, int testParams) +static BOOL check_exists(const char *name) { - HDDEDATA hData; - UINT error; - - DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); - todo_wine - { - ok (expected_result == error, "DeleteGroup %s: Expected Error %s, received %s.%s\n", - groupName, GetStringFromError(expected_result), GetStringFromError(error), - GetStringFromTestParams(testParams)); - } - - if (error == DMLERR_NO_ERROR) - { - /* Check that Group does not exist */ - CheckFileExistsInProgramGroups(groupName, FALSE, TRUE, NULL, testParams); - } -} - -/* Add Item Test - * DDE command, expected result, and group and file name where it should exist. - * checks to make sure error code matches expected error code - * checks to make sure item exists if successful - */ -static void AddItemTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, - const char *fileName, const char *groupName, int testParams) -{ - HDDEDATA hData; - UINT error; - - DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); - todo_wine - { - ok (expected_result == error, "AddItem %s: Expected Error %s, received %s.%s\n", - fileName, GetStringFromError(expected_result), GetStringFromError(error), - GetStringFromTestParams(testParams)); - } - - if (error == DMLERR_NO_ERROR) - { - /* Check that File exists */ - CheckFileExistsInProgramGroups(fileName, TRUE, FALSE, groupName, testParams); - } -} - -/* Delete Item Test. - * DDE command, expected result, and group and file name where it should exist. - * checks to make sure error code matches expected error code - * checks to make sure item does not exist if successful - */ -static void DeleteItemTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, - const char *fileName, const char *groupName, int testParams) -{ - HDDEDATA hData; - UINT error; - - DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); - todo_wine - { - ok (expected_result == error, "DeleteItem %s: Expected Error %s, received %s.%s\n", - fileName, GetStringFromError(expected_result), GetStringFromError(error), - GetStringFromTestParams(testParams)); - } - - if (error == DMLERR_NO_ERROR) - { - /* Check that File does not exist */ - CheckFileExistsInProgramGroups(fileName, FALSE, FALSE, groupName, testParams); - } -} - -/* Compound Command Test. - * not really generic, assumes command of the form: - * [CreateGroup ...][AddItem ...][AddItem ...] - * All samples I've seen using Compound were of this form (CreateGroup, - * AddItems) so this covers minimum expected functionality. - */ -static HWND CompoundCommandTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, - const char *groupName, const char *windowTitle, const char *fileName1, - const char *fileName2, int testParams) -{ - HDDEDATA hData; - UINT error; - HWND hwnd = 0; - - DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); - todo_wine - { - ok (expected_result == error, "Compound String %s: Expected Error %s, received %s.%s\n", - command, GetStringFromError(expected_result), GetStringFromError(error), - GetStringFromTestParams(testParams)); - } - - if (error == DMLERR_NO_ERROR) - { - /* Check that File exists */ - CheckFileExistsInProgramGroups(groupName, TRUE, TRUE, NULL, testParams); - hwnd = CheckWindowCreated(windowTitle, FALSE, testParams); - CheckFileExistsInProgramGroups(fileName1, TRUE, FALSE, groupName, testParams); - CheckFileExistsInProgramGroups(fileName2, TRUE, FALSE, groupName, testParams); - } - return hwnd; -} + char path[MAX_PATH]; -static void CreateAddItemText(char *itemtext, const char *cmdline, const char *name) -{ - lstrcpyA(itemtext, "[AddItem("); - lstrcatA(itemtext, cmdline); - lstrcatA(itemtext, ","); - lstrcatA(itemtext, name); - lstrcatA(itemtext, ")]"); + strcpy(path, ProgramsDir); + strcat(path, "\\"); + strcat(path, name); + return GetFileAttributesA(path) != INVALID_FILE_ATTRIBUTES; } /* 1st set of tests */ -static int DdeTestProgman(DWORD instance, HCONV hConv) +static void test_progman_dde(DWORD instance, HCONV hConv) { - HDDEDATA hData; UINT error; - int testnum; char temppath[MAX_PATH]; char f1g1[MAX_PATH], f2g1[MAX_PATH], f3g1[MAX_PATH], f1g3[MAX_PATH], f2g3[MAX_PATH]; char itemtext[MAX_PATH + 20]; char comptext[2 * (MAX_PATH + 20) + 21]; - HWND hwnd; - testnum = 1; /* Invalid Command */ - DdeExecuteCommand(instance, hConv, "[InvalidCommand()]", &hData, &error, DDE_TEST_MISC|testnum++); - ok (error == DMLERR_NOTPROCESSED, "InvalidCommand(), expected error %s, received %s.\n", - GetStringFromError(DMLERR_NOTPROCESSED), GetStringFromError(error)); + error = dde_execute(instance, hConv, "[InvalidCommand()]"); + ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error); /* On Vista+ the files have to exist when adding a link */ GetTempPathA(MAX_PATH, temppath); @@ -646,38 +280,96 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) GetTempFileNameA(temppath, "dde", 0, f2g3); /* CreateGroup Tests (including AddItem, DeleteItem) */ - CreateGroupTest(instance, hConv, "[CreateGroup(Group1)]", DMLERR_NO_ERROR, "Group1", Group1Title, DDE_TEST_CREATEGROUP|testnum++); - CreateAddItemText(itemtext, f1g1, "f1g1Name"); - AddItemTest(instance, hConv, itemtext, DMLERR_NO_ERROR, "f1g1Name.lnk", "Group1", DDE_TEST_ADDITEM|testnum++); - CreateAddItemText(itemtext, f2g1, "f2g1Name"); - AddItemTest(instance, hConv, itemtext, DMLERR_NO_ERROR, "f2g1Name.lnk", "Group1", DDE_TEST_ADDITEM|testnum++); - DeleteItemTest(instance, hConv, "[DeleteItem(f2g1Name)]", DMLERR_NO_ERROR, "f2g1Name.lnk", "Group1", DDE_TEST_DELETEITEM|testnum++); - CreateAddItemText(itemtext, f3g1, "f3g1Name"); - AddItemTest(instance, hConv, itemtext, DMLERR_NO_ERROR, "f3g1Name.lnk", "Group1", DDE_TEST_ADDITEM|testnum++); - CreateGroupTest(instance, hConv, "[CreateGroup(Group2)]", DMLERR_NO_ERROR, "Group2", Group2Title, DDE_TEST_CREATEGROUP|testnum++); + error = dde_execute(instance, hConv, "[CreateGroup(Group1)]"); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group1"), "directory not created\n"); + ok(check_window_exists(Group1Title), "window not created\n"); + } + + sprintf(itemtext, "[AddItem(%s,f1g1Name)]", f1g1); + error = dde_execute(instance, hConv, itemtext); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group1/f1g1Name.lnk"), "link not created\n"); + } + + sprintf(itemtext, "[AddItem(%s,f2g1Name)]", f2g1); + error = dde_execute(instance, hConv, itemtext); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group1/f2g1Name.lnk"), "link not created\n"); + } + + error = dde_execute(instance, hConv, "[DeleteItem(f2g1Name)]"); + todo_wine + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(!check_exists("Group1/f2g1Name.lnk"), "link should not exist\n"); + + sprintf(itemtext, "[AddItem(%s,f3g1Name)]", f3g1); + error = dde_execute(instance, hConv, itemtext); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group1/f3g1Name.lnk"), "link not created\n"); + } + + error = dde_execute(instance, hConv, "[CreateGroup(Group2)]"); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group2"), "directory not created\n"); + ok(check_window_exists(Group2Title), "window not created\n"); + } + /* Create Group that already exists - same instance */ - CreateGroupTest(instance, hConv, "[CreateGroup(Group1)]", DMLERR_NO_ERROR, "Group1", Group1Title, DDE_TEST_CREATEGROUP|testnum++); + error = dde_execute(instance, hConv, "[CreateGroup(Group1)]"); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group1"), "directory not created\n"); + ok(check_window_exists(Group1Title), "window not created\n"); + } /* ShowGroup Tests */ - ShowGroupTest(instance, hConv, "[ShowGroup(Group1)]", DMLERR_NOTPROCESSED, "Group1", Group1Title, TRUE, DDE_TEST_SHOWGROUP|testnum++); - DeleteItemTest(instance, hConv, "[DeleteItem(f3g1Name)]", DMLERR_NO_ERROR, "f3g1Name.lnk", "Group1", DDE_TEST_DELETEITEM|testnum++); - ShowGroupTest(instance, hConv, "[ShowGroup(Startup,0)]", DMLERR_NO_ERROR, "Startup", StartupTitle, TRUE, DDE_TEST_SHOWGROUP|testnum++); - hwnd = ShowGroupTest(instance, hConv, "[ShowGroup(Group1,0)]", DMLERR_NO_ERROR, "Group1", Group1Title, FALSE, DDE_TEST_SHOWGROUP|testnum++); + error = dde_execute(instance, hConv, "[ShowGroup(Group1)]"); + ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error); - /* DeleteGroup Test - Note that Window is Open for this test */ - DeleteGroupTest(instance, hConv, "[DeleteGroup(Group1)]", DMLERR_NO_ERROR, "Group1", DDE_TEST_DELETEGROUP|testnum++); - if (hwnd) SendMessageA(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); + error = dde_execute(instance, hConv, "[DeleteItem(f3g1Name)]"); + todo_wine + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(!check_exists("Group1/f3g1Name.lnk"), "link should not exist\n"); + + error = dde_execute(instance, hConv, "[ShowGroup(Startup, 0)]"); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_window_exists(StartupTitle), "window not created\n"); + } + + error = dde_execute(instance, hConv, "[ShowGroup(Group1, 0)]"); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_window_exists(Group1Title), "window not created\n"); + } + + /* DeleteGroup Test */ + error = dde_execute(instance, hConv, "[DeleteGroup(Group1)]"); + todo_wine + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(!check_exists("Group1"), "directory should not exist\n"); /* Compound Execute String Command */ - lstrcpyA(comptext, "[CreateGroup(Group3)]"); - CreateAddItemText(itemtext, f1g3, "f1g3Name"); - lstrcatA(comptext, itemtext); - CreateAddItemText(itemtext, f2g3, "f2g3Name"); - lstrcatA(comptext, itemtext); - hwnd = CompoundCommandTest(instance, hConv, comptext, DMLERR_NO_ERROR, "Group3", Group3Title, "f1g3Name.lnk", "f2g3Name.lnk", DDE_TEST_COMPOUND|testnum++); + sprintf(comptext, "[CreateGroup(Group3)][AddItem(%s,f1g3Name)][AddItem(%s,f2g3Name)]", f1g3, f2g3); + error = dde_execute(instance, hConv, comptext); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group3"), "directory not created\n"); + ok(check_window_exists(Group3Title), "window not created\n"); + ok(check_exists("Group3/f1g3Name.lnk"), "link not created\n"); + ok(check_exists("Group3/f2g3Name.lnk"), "link not created\n"); + } - DeleteGroupTest(instance, hConv, "[DeleteGroup(Group3)]", DMLERR_NO_ERROR, "Group3", DDE_TEST_DELETEGROUP|testnum++); - if (hwnd) SendMessageA(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); + error = dde_execute(instance, hConv, "[DeleteGroup(Group3)]"); + todo_wine + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(!check_exists("Group3"), "directory should not exist\n"); /* Full Parameters of Add Item */ /* AddItem(CmdLine[,Name[,IconPath[,IconIndex[,xPos,yPos[,DefDir[,HotKey[,fMinimize[fSeparateSpace]]]]]]]) */ @@ -687,16 +379,25 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) DeleteFileA(f3g1); DeleteFileA(f1g3); DeleteFileA(f2g3); - - return testnum; } /* 2nd set of tests - 2nd connection */ -static void DdeTestProgman2(DWORD instance, HCONV hConv, int testnum) +static void test_progman_dde2(DWORD instance, HCONV hConv) { + UINT error; + /* Create Group that already exists on a separate connection */ - CreateGroupTest(instance, hConv, "[CreateGroup(Group2)]", DMLERR_NO_ERROR, "Group2", Group2Title, DDE_TEST_CREATEGROUP|testnum++); - DeleteGroupTest(instance, hConv, "[DeleteGroup(Group2)]", DMLERR_NO_ERROR, "Group2", DDE_TEST_DELETEGROUP|testnum++); + error = dde_execute(instance, hConv, "[CreateGroup(Group2)]"); + todo_wine { + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(check_exists("Group2"), "directory not created\n"); + ok(check_window_exists(Group2Title), "window not created\n"); + } + + error = dde_execute(instance, hConv, "[DeleteGroup(Group2)]"); + todo_wine + ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); + ok(!check_exists("Group2"), "directory should not exist\n"); } START_TEST(progman_dde) @@ -705,20 +406,19 @@ START_TEST(progman_dde) UINT err; HSZ hszProgman; HCONV hConv; - int testnum; init_function_pointers(); init_strings(); /* Initialize DDE Instance */ err = DdeInitializeA(&instance, DdeCallback, APPCMD_CLIENTONLY, 0); - ok (err == DMLERR_NO_ERROR, "DdeInitialize Error %s\n", GetStringFromError(err)); + ok(err == DMLERR_NO_ERROR, "DdeInitialize() failed: %u\n", err); /* Create Connection */ hszProgman = DdeCreateStringHandleA(instance, "PROGMAN", CP_WINANSI); - ok (hszProgman != NULL, "DdeCreateStringHandle Error %s\n", GetDdeLastErrorStr(instance)); + ok(hszProgman != NULL, "DdeCreateStringHandle() failed: %u\n", DdeGetLastError(instance)); hConv = DdeConnect(instance, hszProgman, hszProgman, NULL); - ok (DdeFreeStringHandle(instance, hszProgman), "DdeFreeStringHandle failure\n"); + ok(DdeFreeStringHandle(instance, hszProgman), "DdeFreeStringHandle() failed: %u\n", DdeGetLastError(instance)); /* Seeing failures on early versions of Windows Connecting to progman, exit if connection fails */ if (hConv == NULL) { @@ -726,30 +426,29 @@ START_TEST(progman_dde) return; } - /* Run Tests */ - testnum = DdeTestProgman(instance, hConv); + test_progman_dde(instance, hConv); /* Cleanup & Exit */ - ok (DdeDisconnect(hConv), "DdeDisonnect Error %s\n", GetDdeLastErrorStr(instance)); - ok (DdeUninitialize(instance), "DdeUninitialize failed\n"); + ok(DdeDisconnect(hConv), "DdeDisonnect() failed: %u\n", DdeGetLastError(instance)); + ok(DdeUninitialize(instance), "DdeUninitialize() failed: %u\n", DdeGetLastError(instance)); /* 2nd Instance (Followup Tests) */ /* Initialize DDE Instance */ instance = 0; err = DdeInitializeA(&instance, DdeCallback, APPCMD_CLIENTONLY, 0); - ok (err == DMLERR_NO_ERROR, "DdeInitialize Error %s\n", GetStringFromError(err)); + ok (err == DMLERR_NO_ERROR, "DdeInitialize() failed: %u\n", err); /* Create Connection */ hszProgman = DdeCreateStringHandleA(instance, "PROGMAN", CP_WINANSI); - ok (hszProgman != NULL, "DdeCreateStringHandle Error %s\n", GetDdeLastErrorStr(instance)); + ok(hszProgman != NULL, "DdeCreateStringHandle() failed: %u\n", DdeGetLastError(instance)); hConv = DdeConnect(instance, hszProgman, hszProgman, NULL); - ok (hConv != NULL, "DdeConnect Error %s\n", GetDdeLastErrorStr(instance)); - ok (DdeFreeStringHandle(instance, hszProgman), "DdeFreeStringHandle failure\n"); + ok(hConv != NULL, "DdeConnect() failed: %u\n", DdeGetLastError(instance)); + ok(DdeFreeStringHandle(instance, hszProgman), "DdeFreeStringHandle() failed: %u\n", DdeGetLastError(instance)); /* Run Tests */ - DdeTestProgman2(instance, hConv, testnum); + test_progman_dde2(instance, hConv); /* Cleanup & Exit */ - ok (DdeDisconnect(hConv), "DdeDisonnect Error %s\n", GetDdeLastErrorStr(instance)); - ok (DdeUninitialize(instance), "DdeUninitialize failed\n"); + ok(DdeDisconnect(hConv), "DdeDisonnect() failed: %u\n", DdeGetLastError(instance)); + ok(DdeUninitialize(instance), "DdeUninitialize() failed: %u\n", DdeGetLastError(instance)); } -- 2.7.4

2 6

[PATCH v2] kernel32: Fix a couple internal uses of ANSI functions.
by Zebediah Figura 01 Dec '17

01 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/file.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 3e93b0d..4766830 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -74,6 +74,7 @@ static const UINT max_entry_size = offsetof( FILE_BOTH_DIRECTORY_INFORMATION, Fi static BOOL oem_file_apis; static const WCHAR wildcardsW[] = { '*','?',0 }; +static const WCHAR krnl386W[] = {'k','r','n','l','3','8','6','.','e','x','e','1','6',0}; /*********************************************************************** * create_file_OF @@ -1587,7 +1588,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, if (vxd_name && vxd_name[0]) { static HANDLE (*vxd_open)(LPCWSTR,DWORD,SECURITY_ATTRIBUTES*); - if (!vxd_open) vxd_open = (void *)GetProcAddress( GetModuleHandleA("krnl386.exe16"), + if (!vxd_open) vxd_open = (void *)GetProcAddress( GetModuleHandleW(krnl386W), "__wine_vxd_open" ); if (vxd_open && (ret = vxd_open( vxd_name, access, sa ))) goto done; } @@ -2613,7 +2614,7 @@ BOOL WINAPI DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, static DeviceIoProc (*vxd_get_proc)(HANDLE); DeviceIoProc proc = NULL; - if (!vxd_get_proc) vxd_get_proc = (void *)GetProcAddress( GetModuleHandleA("krnl386.exe16"), + if (!vxd_get_proc) vxd_get_proc = (void *)GetProcAddress( GetModuleHandleW(krnl386W), "__wine_vxd_get_proc" ); if (vxd_get_proc) proc = vxd_get_proc( hDevice ); if (proc) return proc( dwIoControlCode, lpvInBuffer, cbInBuffer, -- 2.7.4

1 0

[PATCH] msxml3: Remove CRs in domtext_put_data and add them in domtext_get_xml
by Alex Henrie 01 Dec '17

01 Dec '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=42468 On September 8, Nikolay agreed to sign off on this patch if Wine Staging accepted it and there were no reported problems for two months.[1] On September 17, Wine Staging accepted the patch.[2] On September 20, Wine Staging 2.17 was released, which included the patch.[3] It has now been two months and there have been no reported problems. [1] https://www.winehq.org/pipermail/wine-devel/2017-September/118879.html [2] https://github.com/wine-compholio/wine-staging/commit/63a8a664c9a49361ecb67… [3] https://wine-staging.com/news/2017-09-20-release-2.17.html --- dlls/msxml3/tests/domdoc.c | 153 +++++++++++++++++++++++++++++++++++++++------ dlls/msxml3/text.c | 34 +++++++--- 2 files changed, 161 insertions(+), 26 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 9a607e3d3c..f6df417471 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12101,34 +12101,148 @@ static void test_put_data(void) type++; } - /* \r\n sequence is never escaped */ + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + +static void test_newline_normalization(void) +{ + const struct msxmlsupported_data_t *table = domdoc_support_data; + IXMLDOMDocument *doc; + IXMLDOMText *text; + IXMLDOMNode *node; + VARIANT v; + VARIANT_BOOL b; + BSTR s; + HRESULT hr; + LONG length; + V_VT(&v) = VT_I2; V_I2(&v) = NODE_TEXT; - hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); - ok(hr == S_OK, "got 0x%08x\n", hr); + while (table->clsid) + { + if (!is_clsid_supported(table->clsid, &IID_IXMLDOMDocument)) + { + table++; + continue; + } - IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc); + ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMText_get_data(text, &get_data); - ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine - ok(!lstrcmpW(get_data, _bstr_("\n")), "got %s\n", wine_dbgstr_w(get_data)); - SysFreeString(get_data); + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); - hr = IXMLDOMText_get_xml(text, &get_data); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(get_data, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(get_data)); - SysFreeString(get_data); + /* \r\n is normalized to \n and back to \r\n */ - IXMLDOMText_Release(text); - IXMLDOMNode_Release(node); + hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); - IXMLDOMDocument_Release(doc); - free_bstrs(); + hr = IXMLDOMText_get_data(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMText_get_length(text, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 1, "got %d, expected 1\n", length); + + hr = IXMLDOMText_get_xml(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* \r\r\n is normalized to \n\n and back to \r\n\r\n */ + + hr = IXMLDOMText_put_data(text, _bstr_("\r\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMText_get_data(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\n\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMText_get_length(text, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 2, "got %d, expected 2\n", length); + + hr = IXMLDOMText_get_xml(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\r\n\r\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* the same normalizations are applied when loading a document as a whole */ + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?><root>foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* even if xml:space="preserve" */ + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?>" + "<root xml:space=\"preserve\">foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n" + "<root xml:space=\"preserve\">foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* or preserveWhiteSpace is set */ + + hr = IXMLDOMDocument_put_preserveWhiteSpace(doc, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?><root>foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (IsEqualGUID(table->clsid, &CLSID_DOMDocument60)) + { + /* DOMDocument60 does the newline normalization but does not insert line breaks around the root node */ +todo_wine + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?><root>foo\r\n\r\n\r\n\r\nbar</root>")), + "got %s\n", wine_dbgstr_w(s)); + } + else + { + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + } + SysFreeString(s); + + IXMLDOMText_Release(text); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); + free_bstrs(); + table++; + } } static void test_putref_schemas(void) @@ -12712,6 +12826,7 @@ START_TEST(domdoc) test_nodeValue(); test_get_namespaces(); test_put_data(); + test_newline_normalization(); test_putref_schemas(); test_namedmap_newenum(); test_xmlns_attribute(); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 3a12d4bf62..abd89dbd6b 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -522,7 +522,7 @@ static HRESULT WINAPI domtext_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, p); + return node_get_xml(&This->node, TRUE, p); } static HRESULT WINAPI domtext_transformNode( @@ -616,15 +616,35 @@ static HRESULT WINAPI domtext_put_data( BSTR data) { domtext *This = impl_from_IXMLDOMText( iface ); - static const WCHAR rnW[] = {'\r','\n',0}; + BSTR normalized_data = NULL; + HRESULT hr; + size_t i, j; TRACE("(%p)->(%s)\n", This, debugstr_w(data)); - if (data && !strcmpW(rnW, data)) - This->node.node->name = xmlStringTextNoenc; - else - domtext_reset_noenc(This); - return node_set_content(&This->node, data); + if (data) + { + /* normalize line endings */ + normalized_data = SysAllocStringLen(NULL, SysStringLen(data)); + if (!normalized_data) return E_OUTOFMEMORY; + for (i = 0, j = 0; data[i]; i++) + { + if (data[i] == '\r') + { + if (data[i + 1] == '\n') i++; /* change \r\n to just \n */ + normalized_data[j++] = '\n'; /* change \r by itself to \n */ + } + else + normalized_data[j++] = data[i]; + } + normalized_data[j] = 0; + } + + domtext_reset_noenc(This); + hr = node_set_content(&This->node, normalized_data); + + SysFreeString(normalized_data); + return hr; } static HRESULT WINAPI domtext_get_length( -- 2.15.0

2 2

[PATCH] kernel32: Fix a couple internal uses of ANSI functions.
by Zebediah Figura 01 Dec '17

01 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/file.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 3e93b0d..aa57351 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1586,8 +1586,9 @@ HANDLE WINAPI CreateFileW( LPCWSTR filename, DWORD access, DWORD sharing, { if (vxd_name && vxd_name[0]) { + static const WCHAR krnl386W[] = {'k','r','n','l','3','8','6','.','e','x','e','1','6',0}; static HANDLE (*vxd_open)(LPCWSTR,DWORD,SECURITY_ATTRIBUTES*); - if (!vxd_open) vxd_open = (void *)GetProcAddress( GetModuleHandleA("krnl386.exe16"), + if (!vxd_open) vxd_open = (void *)GetProcAddress( GetModuleHandleW(krnl386W), "__wine_vxd_open" ); if (vxd_open && (ret = vxd_open( vxd_name, access, sa ))) goto done; } @@ -2609,11 +2610,12 @@ BOOL WINAPI DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode, if (HIWORD( dwIoControlCode ) == 0 && (GetVersion() & 0x80000000)) { + static const WCHAR krnl386W[] = {'k','r','n','l','3','8','6','.','e','x','e','1','6',0}; typedef BOOL (WINAPI *DeviceIoProc)(DWORD, LPVOID, DWORD, LPVOID, DWORD, LPDWORD, LPOVERLAPPED); static DeviceIoProc (*vxd_get_proc)(HANDLE); DeviceIoProc proc = NULL; - if (!vxd_get_proc) vxd_get_proc = (void *)GetProcAddress( GetModuleHandleA("krnl386.exe16"), + if (!vxd_get_proc) vxd_get_proc = (void *)GetProcAddress( GetModuleHandleW(krnl386W), "__wine_vxd_get_proc" ); if (vxd_get_proc) proc = vxd_get_proc( hDevice ); if (proc) return proc( dwIoControlCode, lpvInBuffer, cbInBuffer, -- 2.7.4

2 1

[PATCH] kernel32: Don't use the TEB static buffer in CreateFileA().
by Zebediah Figura 01 Dec '17

01 Dec '17

We might call GetModuleHandle("krnl386.exe16") later, which will overwrite the static buffer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/kernel32/file.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 3e93b0d..5301eaf 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1633,10 +1633,13 @@ HANDLE WINAPI CreateFileA( LPCSTR filename, DWORD access, DWORD sharing, DWORD attributes, HANDLE template) { WCHAR *nameW; + HANDLE file; if ((GetVersion() & 0x80000000) && IsBadStringPtrA(filename, -1)) return INVALID_HANDLE_VALUE; - if (!(nameW = FILE_name_AtoW( filename, FALSE ))) return INVALID_HANDLE_VALUE; - return CreateFileW( nameW, access, sharing, sa, creation, attributes, template ); + if (!(nameW = FILE_name_AtoW( filename, TRUE ))) return INVALID_HANDLE_VALUE; + file = CreateFileW( nameW, access, sharing, sa, creation, attributes, template ); + HeapFree( GetProcessHeap(), 0, nameW ); + return file; } /************************************************************************* -- 2.7.4

2 2

[PATCH v2] wined3d: Unbind the FBOs before dispatching compute shader
by Fabian Maurer 01 Dec '17

01 Dec '17

v2 Move changes into context_apply_compute_state and use proper helper functions Fixes Bug 43406 Unbinding the FBO before executing the compute shader makes sure that it doesn't read garbage from it. This only an issue on open source drivers, since the proprietary drivers play safe and synchronize. But since this is undefined behavior, wine should avoid relying on that. Many thanks to Matias N. Goldberg and Philip Rebohle for investigating and solving the bug! Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/wined3d/context.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 92c026c6cd..eb2497a942 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4016,6 +4016,10 @@ void context_apply_compute_state(struct wined3d_context *context, context->update_unordered_access_view_bindings = 1; } + /* Unbind the FBOs to avoid undefined behavior when reading data from it inside the shader */ + context_bind_fbo(context, GL_FRAMEBUFFER, 0); + context_invalidate_state(context, STATE_FRAMEBUFFER); + context->last_was_blit = FALSE; } -- 2.15.1

1 0

[PATCH] wined3d: Unbind the FBOs before glDispatchCompute
by Fabian Maurer 01 Dec '17

01 Dec '17

Fixes Bug 43406 Unbinding the FBO before executing the compute shader makes sure that it doesn't read garbage from it. This only an issue on open source drivers, since the proprietary drivers play safe and synchronize. But since this is undefined behavior, wine should avoid relying on that. Many thanks to Matias N. Goldberg and Philip Rebohle for investigating and solving the bug! Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/wined3d/drawprim.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 404623c9ac..f39c9961e9 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -858,6 +858,10 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state return; } + /* Unbind the FBOs to avoid have undefined behavior when reading data from it */ + GL_EXTCALL(glBindFramebuffer(GL_READ_FRAMEBUFFER, 0)); + GL_EXTCALL(glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0)); + if (parameters->indirect) { const struct wined3d_indirect_dispatch_parameters *indirect = &parameters->u.indirect; @@ -875,6 +879,10 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state } checkGLcall("dispatch compute"); + /* Now rebind the FBOs to restore the original state */ + GL_EXTCALL(glBindFramebuffer(GL_READ_FRAMEBUFFER, context->fbo_read_binding)); + GL_EXTCALL(glBindFramebuffer(GL_DRAW_FRAMEBUFFER, context->fbo_draw_binding)); + GL_EXTCALL(glMemoryBarrier(GL_ALL_BARRIER_BITS)); checkGLcall("glMemoryBarrier"); -- 2.15.0

3 5

[PATCH] ole32: Add user marshalling for bitmaps.
by Zebediah Figura 01 Dec '17

01 Dec '17

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ole32/tests/usrmarshal.c | 46 +++++++++++++++ dlls/ole32/usrmarshal.c | 126 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 158 insertions(+), 14 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 529ad757c6a..ba62bb08c23 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -1190,6 +1190,51 @@ static void test_marshal_HBRUSH(void) DeleteObject(hBrush); } +static void test_marshal_HBITMAP(void) +{ + static const ULONG header_size = FIELD_OFFSET(userBITMAP, cbSize); + static BYTE bmp_bits[1024]; + MIDL_STUB_MESSAGE stub_msg; + HBITMAP hBitmap, hBitmap2; + USER_MARSHAL_CB umcb; + RPC_MESSAGE rpc_msg; + unsigned char *buffer; + unsigned char bitmap[1024]; + ULONG size, bitmap_size; + + memset(bmp_bits, 0xbb, sizeof(bmp_bits)); + hBitmap = CreateBitmap(16, 16, 1, 1, bmp_bits); + ok(hBitmap != 0, "CreateBitmap failed\n"); + size = GetObjectA(hBitmap, sizeof(bitmap), bitmap); + ok(size != 0, "GetObject failed\n"); + bitmap_size = GetBitmapBits(hBitmap, 0, NULL); + ok(bitmap_size != 0, "GetBitmapBits failed\n"); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + size = HBITMAP_UserSize(&umcb.Flags, 0, &hBitmap); + ok(size == 0xc + header_size + bitmap_size || + broken(size == 0x10 + header_size + bitmap_size), /* Windows adds 4 extra (unused) bytes */ + "Wrong size %d\n", size); + + buffer = HeapAlloc(GetProcessHeap(), 0, size); + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HBITMAP_UserMarshal(&umcb.Flags, buffer, &hBitmap); + ok(*(ULONG *)buffer == WDT_REMOTE_CALL, "Context should be WDT_REMOTE_CALL instead of 0x%08x\n", *(ULONG *)buffer); + ok(*(ULONG *)(buffer + 0x4) == (ULONG)(ULONG_PTR)hBitmap, "wirestgm + 0x4 should be bitmap handle instead of 0x%08x\n", *(ULONG *)(buffer + 0x4)); + ok(*(ULONG *)(buffer + 0x8) == (ULONG)(ULONG_PTR)bitmap_size, "wirestgm + 0x8 should be bitmap size instead of 0x%08x\n", *(ULONG *)(buffer + 0x4)); + ok(!memcmp(buffer + 0xc, bitmap, header_size), "buffer mismatch\n"); + ok(!memcmp(buffer + 0xc + header_size, bmp_bits, bitmap_size), "buffer mismatch\n"); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_LOCAL); + HBITMAP_UserUnmarshal(&umcb.Flags, buffer, &hBitmap2); + ok(hBitmap2 != NULL, "Didn't unmarshal properly\n"); + HeapFree(GetProcessHeap(), 0, buffer); + + init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_LOCAL); + HBITMAP_UserFree(&umcb.Flags, &hBitmap2); + DeleteObject(hBitmap); +} + struct obj { IDataObject IDataObject_iface; @@ -1353,6 +1398,7 @@ START_TEST(usrmarshal) test_marshal_HDC(); test_marshal_HICON(); test_marshal_HBRUSH(); + test_marshal_HBITMAP(); test_GetDataHere_Proxy(); diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 03ad689f03b..605cdbc1822 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -586,8 +586,26 @@ void __RPC_USER HGLOBAL_UserFree(ULONG *pFlags, HGLOBAL *phGlobal) */ ULONG __RPC_USER HBITMAP_UserSize(ULONG *pFlags, ULONG StartingSize, HBITMAP *phBmp) { - FIXME(":stub\n"); - return StartingSize; + ULONG size = StartingSize; + + TRACE("(%s, %d, %p)\n", debugstr_user_flags(pFlags), StartingSize, *phBmp); + + size += sizeof(ULONG); + if (LOWORD(*pFlags) == MSHCTX_INPROC) + size += sizeof(ULONG_PTR); + else + { + size += sizeof(ULONG); + + if (*phBmp) + { + size += sizeof(ULONG); + size += FIELD_OFFSET(userBITMAP, cbSize); + size += GetBitmapBits(*phBmp, 0, NULL); + } + } + + return size; } /****************************************************************************** @@ -611,7 +629,43 @@ ULONG __RPC_USER HBITMAP_UserSize(ULONG *pFlags, ULONG StartingSize, HBITMAP *ph */ unsigned char * __RPC_USER HBITMAP_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HBITMAP *phBmp) { - FIXME(":stub\n"); + TRACE("(%s, %p, %p)\n", debugstr_user_flags(pFlags), pBuffer, *phBmp); + + if (LOWORD(*pFlags) == MSHCTX_INPROC) + { + if (sizeof(*phBmp) == 8) + *(ULONG *)pBuffer = WDT_INPROC64_CALL; + else + *(ULONG *)pBuffer = WDT_INPROC_CALL; + pBuffer += sizeof(ULONG); + *(HBITMAP *)pBuffer = *phBmp; + pBuffer += sizeof(HBITMAP); + } + else + { + *(ULONG *)pBuffer = WDT_REMOTE_CALL; + pBuffer += sizeof(ULONG); + *(ULONG *)pBuffer = (ULONG)(ULONG_PTR)*phBmp; + pBuffer += sizeof(ULONG); + + if (*phBmp) + { + static const ULONG header_size = FIELD_OFFSET(userBITMAP, cbSize); + BITMAP bitmap; + ULONG bitmap_size; + + bitmap_size = GetBitmapBits(*phBmp, 0, NULL); + *(ULONG *)pBuffer = bitmap_size; + pBuffer += sizeof(ULONG); + + GetObjectW(*phBmp, sizeof(BITMAP), &bitmap); + memcpy(pBuffer, &bitmap, header_size); + pBuffer += header_size; + + GetBitmapBits(*phBmp, bitmap_size, pBuffer); + pBuffer += bitmap_size; + } + } return pBuffer; } @@ -636,7 +690,54 @@ unsigned char * __RPC_USER HBITMAP_UserMarshal(ULONG *pFlags, unsigned char *pBu */ unsigned char * __RPC_USER HBITMAP_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HBITMAP *phBmp) { - FIXME(":stub\n"); + ULONG fContext; + + TRACE("(%s, %p, %p)\n", debugstr_user_flags(pFlags), pBuffer, phBmp); + + fContext = *(ULONG *)pBuffer; + pBuffer += sizeof(ULONG); + + if (((fContext == WDT_INPROC_CALL) && (sizeof(*phBmp) < 8)) || + ((fContext == WDT_INPROC64_CALL) && (sizeof(*phBmp) == 8))) + { + *phBmp = *(HBITMAP *)pBuffer; + pBuffer += sizeof(*phBmp); + } + else if (fContext == WDT_REMOTE_CALL) + { + ULONG handle; + + handle = *(ULONG *)pBuffer; + pBuffer += sizeof(ULONG); + + if (handle) + { + static const ULONG header_size = FIELD_OFFSET(userBITMAP, cbSize); + BITMAP bitmap; + ULONG bitmap_size; + unsigned char *bits; + + bitmap_size = *(ULONG *)pBuffer; + pBuffer += sizeof(ULONG); + bits = HeapAlloc(GetProcessHeap(), 0, bitmap_size); + + memcpy(&bitmap, pBuffer, header_size); + pBuffer += header_size; + + memcpy(bits, pBuffer, bitmap_size); + pBuffer += bitmap_size; + + bitmap.bmBits = bits; + *phBmp = CreateBitmapIndirect(&bitmap); + + HeapFree(GetProcessHeap(), 0, bits); + } + else + *phBmp = NULL; + } + else + RaiseException(RPC_S_INVALID_TAG, 0, 0, NULL); + return pBuffer; } @@ -660,7 +761,10 @@ unsigned char * __RPC_USER HBITMAP_UserUnmarshal(ULONG *pFlags, unsigned char *p */ void __RPC_USER HBITMAP_UserFree(ULONG *pFlags, HBITMAP *phBmp) { - FIXME(":stub\n"); + TRACE("(%s, %p)\n", debugstr_user_flags(pFlags), *phBmp); + + if (LOWORD(*pFlags) != MSHCTX_INPROC) + DeleteObject(*phBmp); } /****************************************************************************** @@ -1620,9 +1724,7 @@ ULONG __RPC_USER STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, STGMEDIUM case TYMED_GDI: TRACE("TYMED_GDI\n"); if (pStgMedium->u.hBitmap) - { - FIXME("not implemented for GDI object %p\n", pStgMedium->u.hBitmap); - } + size = HBITMAP_UserSize(pFlags, size, &pStgMedium->u.hBitmap); break; case TYMED_MFPICT: TRACE("TYMED_MFPICT\n"); @@ -1732,9 +1834,7 @@ unsigned char * __RPC_USER STGMEDIUM_UserMarshal(ULONG *pFlags, unsigned char *p case TYMED_GDI: TRACE("TYMED_GDI\n"); if (pStgMedium->u.hBitmap) - { - FIXME("not implemented for GDI object %p\n", pStgMedium->u.hBitmap); - } + pBuffer = HBITMAP_UserMarshal(pFlags, pBuffer, &pStgMedium->u.hBitmap); break; case TYMED_MFPICT: TRACE("TYMED_MFPICT\n"); @@ -1870,9 +1970,7 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char case TYMED_GDI: TRACE("TYMED_GDI\n"); if (content) - { - FIXME("not implemented for GDI object\n"); - } + pBuffer = HBITMAP_UserUnmarshal(pFlags, pBuffer, &pStgMedium->u.hBitmap); else pStgMedium->u.hBitmap = NULL; break; -- 2.15.0

2 2

[PATCH 1/3] shell32: Implement the AddItem() command for Progman DDE.
by Zebediah Figura 01 Dec '17

01 Dec '17

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/shell32/dde.c | 81 +++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/progman_dde.c | 15 ++------ 2 files changed, 84 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/dde.c b/dlls/shell32/dde.c index 36b5dfa..412c047 100644 --- a/dlls/shell32/dde.c +++ b/dlls/shell32/dde.c @@ -20,11 +20,14 @@ #include <stdarg.h> +#define COBJMACROS #include "windef.h" #include "winbase.h" #include "winuser.h" #include "ddeml.h" #include "shellapi.h" +#include "shobjidl.h" +#include "shlwapi.h" #include "shell32_main.h" @@ -122,6 +125,13 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) static const WCHAR create_groupW[] = {'C','r','e','a','t','e','G','r','o','u','p',0}; static const WCHAR delete_groupW[] = {'D','e','l','e','t','e','G','r','o','u','p',0}; static const WCHAR show_groupW[] = {'S','h','o','w','G','r','o','u','p',0}; + static const WCHAR add_itemW[] = {'A','d','d','I','t','e','m',0}; + + static const WCHAR dotexeW[] = {'.','e','x','e',0}; + static const WCHAR dotlnkW[] = {'.','l','n','k',0}; + static const WCHAR slashW[] = {'/',0}; + + static WCHAR *last_group; if (!strcmpiW(command, create_groupW)) { @@ -134,7 +144,8 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) CreateDirectoryW(path, NULL); ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); - HeapFree(GetProcessHeap(), 0, path); + if (last_group) HeapFree(GetProcessHeap(), 0, last_group); + last_group = path; } else if (!strcmpiW(command, delete_groupW)) { @@ -173,7 +184,75 @@ static DWORD PROGMAN_OnExecute(WCHAR *command, int argc, WCHAR **argv) ShellExecuteW(NULL, NULL, path, NULL, NULL, SW_SHOWNORMAL); + if (last_group) HeapFree(GetProcessHeap(), 0, last_group); + last_group = path; + } + else if (!strcmpiW(command, add_itemW)) + { + WCHAR *path, *name; + DWORD len; + IShellLinkW *link; + IPersistFile *file; + HRESULT hres; + + if (argc < 1) return DDE_FNOTPROCESSED; + + hres = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, + &IID_IShellLinkW, (void **)&link); + if (FAILED(hres)) return DDE_FNOTPROCESSED; + + len = SearchPathW(NULL, argv[0], dotexeW, 0, NULL, NULL); + if (len == 0) + { + IShellLinkW_Release(link); + return DDE_FNOTPROCESSED; + } + path = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + SearchPathW(NULL, argv[0], dotexeW, len, path, NULL); + IShellLinkW_SetPath(link, path); HeapFree(GetProcessHeap(), 0, path); + + if (argc >= 2) IShellLinkW_SetDescription(link, argv[1]); + if (argc >= 4) IShellLinkW_SetIconLocation(link, argv[2], atoiW(argv[3])); + if (argc >= 7) IShellLinkW_SetWorkingDirectory(link, argv[6]); + if (argc >= 8) IShellLinkW_SetHotkey(link, atoiW(argv[7])); + if (argc >= 9) + { + if (atoiW(argv[8]) == 0) IShellLinkW_SetShowCmd(link, SW_SHOWMINNOACTIVE); + else if (atoiW(argv[8]) == 1) IShellLinkW_SetShowCmd(link, SW_SHOWNORMAL); + } + + hres = IShellLinkW_QueryInterface(link, &IID_IPersistFile, (void **)&file); + if (FAILED(hres)) + { + IShellLinkW_Release(link); + return DDE_FNOTPROCESSED; + } + if (argc >= 2) + { + name = HeapAlloc(GetProcessHeap(), 0, (strlenW(last_group) + 1 + strlenW(argv[1]) + 5) * sizeof(*name)); + lstrcpyW(name, last_group); + lstrcatW(name, slashW); + lstrcatW(name, argv[1]); + lstrcatW(name, dotlnkW); + } + else + { + const WCHAR *filename = PathFindFileNameW(argv[0]); + int len = PathFindExtensionW(filename) - filename; + name = HeapAlloc(GetProcessHeap(), 0, (strlenW(last_group) + 1 + len + 5) * sizeof(*name)); + lstrcpyW(name, last_group); + lstrcatW(name, slashW); + lstrcpynW(name+strlenW(name), filename, len + 1); + lstrcatW(name, dotlnkW); + } + hres = IPersistFile_Save(file, name, TRUE); + + HeapFree(GetProcessHeap(), 0, name); + IPersistFile_Release(file); + IShellLinkW_Release(link); + + if (FAILED(hres)) return DDE_FNOTPROCESSED; } else { diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index b54a72a..544df97 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -287,29 +287,24 @@ static void test_progman_dde(DWORD instance, HCONV hConv) sprintf(itemtext, "[AddItem(%s,f1g1Name)]", f1g1); error = dde_execute(instance, hConv, itemtext); - todo_wine { ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(check_exists("Group1/f1g1Name.lnk"), "link not created\n"); - } sprintf(itemtext, "[AddItem(%s,f2g1Name)]", f2g1); error = dde_execute(instance, hConv, itemtext); - todo_wine { ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(check_exists("Group1/f2g1Name.lnk"), "link not created\n"); - } error = dde_execute(instance, hConv, "[DeleteItem(f2g1Name)]"); - todo_wine + todo_wine { ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(!check_exists("Group1/f2g1Name.lnk"), "link should not exist\n"); + } sprintf(itemtext, "[AddItem(%s,f3g1Name)]", f3g1); error = dde_execute(instance, hConv, itemtext); - todo_wine { ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(check_exists("Group1/f3g1Name.lnk"), "link not created\n"); - } error = dde_execute(instance, hConv, "[CreateGroup(Group2)]"); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); @@ -327,9 +322,10 @@ static void test_progman_dde(DWORD instance, HCONV hConv) ok(error == DMLERR_NOTPROCESSED, "expected DMLERR_NOTPROCESSED, got %u\n", error); error = dde_execute(instance, hConv, "[DeleteItem(f3g1Name)]"); - todo_wine + todo_wine { ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(!check_exists("Group1/f3g1Name.lnk"), "link should not exist\n"); + } error = dde_execute(instance, hConv, "[ShowGroup(Startup, 0)]"); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); @@ -347,14 +343,11 @@ static void test_progman_dde(DWORD instance, HCONV hConv) /* Compound Execute String Command */ sprintf(comptext, "[CreateGroup(Group3)][AddItem(%s,f1g3Name)][AddItem(%s,f2g3Name)]", f1g3, f2g3); error = dde_execute(instance, hConv, comptext); - todo_wine ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); ok(check_exists("Group3"), "directory not created\n"); ok(check_window_exists(Group3Title), "window not created\n"); - todo_wine { ok(check_exists("Group3/f1g3Name.lnk"), "link not created\n"); ok(check_exists("Group3/f2g3Name.lnk"), "link not created\n"); - } error = dde_execute(instance, hConv, "[DeleteGroup(Group3)]"); ok(error == DMLERR_NO_ERROR, "expected DMLERR_NO_ERROR, got %u\n", error); -- 2.7.4

1 2

[PATCH 9/9] mshtml: Added IDOMEvent::get_target implementation.
by Jacek Caban 01 Dec '17

01 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)

1 0

[PATCH 8/9] mshtml: Added IDOMEvent::get_currentTarget implementation.
by Jacek Caban 01 Dec '17

01 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 32 +++++++++++++++++++++++--------- dlls/mshtml/htmlevent.h | 1 + 2 files changed, 24 insertions(+), 9 deletions(-)

1 0

[PATCH 7/9] mshtml: Fixed event target leak in dispatch_event.
by Jacek Caban 01 Dec '17

01 Dec '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

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-devel