June 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : dwrite: Set line baseline/height from font metrics.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: 8adc6679e9750cfd0ddf5821585f1cdbfa64cbc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8adc6679e9750cfd0ddf58215… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 21 15:34:02 2015 +0300 dwrite: Set line baseline/height from font metrics. --- dlls/dwrite/layout.c | 61 ++++++++++++++++++++++++++++++++++++++++++---- dlls/dwrite/tests/layout.c | 3 +-- 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index ebc6f37..ba31ec6 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -168,6 +168,8 @@ struct layout_run { struct inline_object_run object; struct regular_layout_run regular; } u; + FLOAT baseline; + FLOAT height; }; struct layout_effective_run { @@ -573,6 +575,11 @@ static inline UINT32 get_clipped_range_length(const struct dwrite_textlayout *la return layout->len - range->h.range.startPosition; } +static inline FLOAT get_scaled_font_metric(UINT32 metric, FLOAT emSize, const DWRITE_FONT_METRICS *metrics) +{ + return (FLOAT)metric * emSize / (FLOAT)metrics->designUnitsPerEm; +} + static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) { IDWriteTextAnalyzer *analyzer; @@ -639,6 +646,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props = NULL; DWRITE_SHAPING_TEXT_PROPERTIES *text_props = NULL; struct regular_layout_run *run = &r->u.regular; + DWRITE_FONT_METRICS fontmetrics = { 0 }; IDWriteFontFamily *family; UINT32 index, max_count; IDWriteFont *font; @@ -669,6 +677,8 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) hr = S_OK; } metrics->width = inlinemetrics.width; + r->baseline = inlinemetrics.baseline; + r->height = inlinemetrics.height; /* FIXME: use resolved breakpoints in this case too */ @@ -778,6 +788,22 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) run->run.glyphCount = 0; else run->run.glyphCount = run->glyphcount; + + /* baseline derived from font metrics */ + if (layout->gdicompatible) { + /* FIXME: check return value when it's actually implemented */ + IDWriteFontFace_GetGdiCompatibleMetrics(run->run.fontFace, + run->run.fontEmSize, + layout->pixels_per_dip, + &layout->transform, + &fontmetrics); + } + else + IDWriteFontFace_GetMetrics(run->run.fontFace, &fontmetrics); + + r->baseline = get_scaled_font_metric(fontmetrics.ascent, run->run.fontEmSize, &fontmetrics); + r->height = get_scaled_font_metric(fontmetrics.ascent + fontmetrics.descent, run->run.fontEmSize, &fontmetrics); + layout_set_cluster_metrics(layout, r, &cluster); continue; @@ -1059,11 +1085,15 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) layout->clustermetrics[i].isNewline || /* always wrap on new line */ i == layout->cluster_count - 1) /* end of the text */ { - UINT32 strlength, index = i; + UINT32 strlength, last_cluster = i, index; + FLOAT descent; - if (!overflow) + if (!overflow) { metrics.length += layout->clustermetrics[i].length; - strlength = metrics.length; + last_cluster = i; + } + else + last_cluster = i ? i - 1 : i; if (i >= start) { hr = layout_add_effective_run(layout, run, start, i - start + 1, origin_x, s[0]); @@ -1074,6 +1104,8 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) /* take a look at clusters we got for this line in reverse order to set trailing properties for current line */ + strlength = metrics.length; + index = last_cluster; while (strlength) { DWRITE_CLUSTER_METRICS *cluster = &layout->clustermetrics[index]; @@ -1092,8 +1124,27 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) index--; } - metrics.height = 0.0; /* FIXME */ - metrics.baseline = 0.0; /* FIXME */ + /* look for max baseline and descent for this line */ + strlength = metrics.length; + index = last_cluster; + metrics.baseline = 0.0; + descent = 0.0; + while (strlength) { + DWRITE_CLUSTER_METRICS *cluster = &layout->clustermetrics[index]; + const struct layout_run *cur = layout->clusters[index].run; + FLOAT cur_descent = cur->height - cur->baseline; + + if (cur->baseline > metrics.baseline) + metrics.baseline = cur->baseline; + + if (cur_descent > descent) + descent = cur_descent; + + strlength -= cluster->length; + index--; + } + metrics.height = descent + metrics.baseline; + metrics.isTrimmed = width > layout->maxwidth; hr = layout_set_line_metrics(layout, &metrics, &line); if (FAILED(hr)) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 51e7f4a..505c2eb 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2767,12 +2767,11 @@ static void test_GetLineMetrics(void) ok(fontface != NULL, "got %p\n", fontface); IDWriteFontFace_GetMetrics(fontface, &fontmetrics); -todo_wine { ok(metrics.baseline == fontmetrics.ascent, "got %.2f, expected %d\n", metrics.baseline, fontmetrics.ascent); ok(metrics.height == fontmetrics.ascent + fontmetrics.descent, "got %.2f, expected %d\n", metrics.height, fontmetrics.ascent + fontmetrics.descent); -} + IDWriteFontFace_Release(fontface); IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format);

1 0

Nikolay Sivov : quartz/tests: Get rid of some casts.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: 9c9f8c0bb99efde296eb647b27524cb0796698b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9f8c0bb99efde296eb647b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 21 10:43:00 2015 +0300 quartz/tests: Get rid of some casts. --- dlls/quartz/tests/referenceclock.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/referenceclock.c b/dlls/quartz/tests/referenceclock.c index eb6fbda..4721675 100644 --- a/dlls/quartz/tests/referenceclock.c +++ b/dlls/quartz/tests/referenceclock.c @@ -28,21 +28,21 @@ static void test_IReferenceClock_query_interface(const char * clockdesc, IReferenceClock * pClock) { HRESULT hr; - void *pF; + IUnknown *pF; - hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, &pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, (void**)&pF); ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF != NULL, "pF is NULL\n"); - if (SUCCEEDED(hr)) IUnknown_Release((IUnknown *)pF); + if (SUCCEEDED(hr)) IUnknown_Release(pF); - hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, &pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, (void**)&pF); ok(hr == E_NOINTERFACE, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF == NULL, "pF is not NULL\n"); - hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, &pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, (void**)&pF); ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF != NULL, "pF is NULL\n"); - if (SUCCEEDED(hr)) IReferenceClock_Release((IReferenceClock *)pF); + if (SUCCEEDED(hr)) IUnknown_Release(pF); } /* The following method expects a reference clock that will keep ticking for

1 0

Huw Davies : Revert "advapi32: Fix RegEnumValueW when enumerating long values.".
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: 645a31474ccff7923a254aa71f862818a8cde9ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=645a31474ccff7923a254aa71… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 22 21:23:54 2015 +0100 Revert "advapi32: Fix RegEnumValueW when enumerating long values.". This reverts commit 443ef6e7a6026f6aaa5ffcfcbc33d582da780ac5. The tests fail on all versions of Windows. --- dlls/advapi32/registry.c | 68 +++++++++++++++++++++++------------------- dlls/advapi32/tests/registry.c | 13 -------- 2 files changed, 37 insertions(+), 44 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index f8bf21a..30130b1 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1922,47 +1922,53 @@ LSTATUS WINAPI RegEnumValueW( HKEY hkey, DWORD index, LPWSTR value, LPDWORD val_ status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, buffer, total_size, &total_size ); + if (status && status != STATUS_BUFFER_OVERFLOW) goto done; - /* retry with a dynamically allocated buffer */ - while (status == STATUS_BUFFER_OVERFLOW) - { - if (buf_ptr != buffer) heap_free( buf_ptr ); - if (!(buf_ptr = heap_alloc( total_size ))) return ERROR_NOT_ENOUGH_MEMORY; - info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; - status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, - buf_ptr, total_size, &total_size ); - } - - if (status) goto done; - - if (value) + if (value || data) { - if (info->NameLength/sizeof(WCHAR) >= *val_count) + /* retry with a dynamically allocated buffer */ + while (status == STATUS_BUFFER_OVERFLOW) { - status = STATUS_BUFFER_OVERFLOW; - goto overflow; + if (buf_ptr != buffer) heap_free( buf_ptr ); + if (!(buf_ptr = heap_alloc( total_size ))) + return ERROR_NOT_ENOUGH_MEMORY; + info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; + status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, + buf_ptr, total_size, &total_size ); } - memcpy( value, info->Name, info->NameLength ); - *val_count = info->NameLength / sizeof(WCHAR); - value[*val_count] = 0; - } - if (data) - { - if (total_size - info->DataOffset > *count) + if (status) goto done; + + if (value) { - status = STATUS_BUFFER_OVERFLOW; - goto overflow; + if (info->NameLength/sizeof(WCHAR) >= *val_count) + { + status = STATUS_BUFFER_OVERFLOW; + goto overflow; + } + memcpy( value, info->Name, info->NameLength ); + *val_count = info->NameLength / sizeof(WCHAR); + value[*val_count] = 0; } - memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); - if (total_size - info->DataOffset <= *count-sizeof(WCHAR) && is_string(info->Type)) + + if (data) { - /* if the type is REG_SZ and data is not 0-terminated - * and there is enough space in the buffer NT appends a \0 */ - WCHAR *ptr = (WCHAR *)(data + total_size - info->DataOffset); - if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; + if (total_size - info->DataOffset > *count) + { + status = STATUS_BUFFER_OVERFLOW; + goto overflow; + } + memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); + if (total_size - info->DataOffset <= *count-sizeof(WCHAR) && is_string(info->Type)) + { + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + WCHAR *ptr = (WCHAR *)(data + total_size - info->DataOffset); + if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; + } } } + else status = STATUS_SUCCESS; overflow: if (type) *type = info->Type; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 561101b..c801384 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -522,8 +522,6 @@ static void test_enum_value(void) static const WCHAR foobarW[] = {'f','o','o','b','a','r',0}; static const WCHAR testW[] = {'T','e','s','t',0}; static const WCHAR xxxW[] = {'x','x','x','x','x','x','x','x',0}; - WCHAR longW[128]; - int i; /* create the working key for new 'Test' value */ res = RegCreateKeyA( hkey_main, "TestKey", &test_key ); @@ -712,17 +710,6 @@ static void test_enum_value(void) ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); ok( !memcmp( dataW, foobarW, sizeof(foobarW) ), "data is not 'foobar'\n" ); - /* tests the overflow case for the fixed "char buffer[]" in RegEnumValueW */ - for (i = 0; i < sizeof(longW)/sizeof(WCHAR); i++) longW[i] = 'x'; - longW[i - 1] = 0; - res = RegSetValueExW( test_key, testW, 0, REG_SZ, (const BYTE *)longW, sizeof(longW) ); - ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); - data_count = 20; - type = 1234; - res = RegEnumValueW( test_key, 0, NULL, NULL, NULL, &type, NULL, &data_count); - ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); - ok( data_count == sizeof(longW), "data_count set to %d\n", data_count ); - cleanup: RegDeleteKeyA(test_key, ""); RegCloseKey(test_key);

1 0

Nikolay Sivov : amstream: Implement IDirectDrawStreamSample_GetSurface().
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: 139445eb49c3f3500a1105fa7803b8f35b2bf5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=139445eb49c3f3500a1105fa7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 22 22:39:41 2015 +0300 amstream: Implement IDirectDrawStreamSample_GetSurface(). --- dlls/amstream/mediastream.c | 58 ++++++++++++++++++---- dlls/amstream/tests/amstream.c | 106 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 154 insertions(+), 10 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index b457d1f..f51d4dd 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -31,7 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); -static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawStreamSample **ddraw_stream_sample); +static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawSurface *surface, + const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample); static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample); typedef struct { @@ -388,12 +389,12 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_SetDirect } static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_CreateSample(IDirectDrawMediaStream *iface, - IDirectDrawSurface *pSurface, const RECT *pRect, DWORD dwFlags, + IDirectDrawSurface *surface, const RECT *rect, DWORD dwFlags, IDirectDrawStreamSample **ppSample) { - TRACE("(%p)->(%p,%p,%x,%p)\n", iface, pSurface, pRect, dwFlags, ppSample); + TRACE("(%p)->(%p,%s,%x,%p)\n", iface, surface, wine_dbgstr_rect(rect), dwFlags, ppSample); - return ddrawstreamsample_create(iface, ppSample); + return ddrawstreamsample_create(iface, surface, rect, ppSample); } static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetTimePerFrame(IDirectDrawMediaStream *iface, @@ -854,6 +855,8 @@ typedef struct { IDirectDrawStreamSample IDirectDrawStreamSample_iface; LONG ref; IMediaStream *parent; + IDirectDrawSurface *surface; + RECT rect; } IDirectDrawStreamSampleImpl; static inline IDirectDrawStreamSampleImpl *impl_from_IDirectDrawStreamSample(IDirectDrawStreamSample *iface) @@ -900,7 +903,11 @@ static ULONG WINAPI IDirectDrawStreamSampleImpl_Release(IDirectDrawStreamSample TRACE("(%p)->(): new ref = %u\n", iface, ref); if (!ref) + { + if (This->surface) + IDirectDrawSurface_Release(This->surface); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -948,9 +955,21 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawSt static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetSurface(IDirectDrawStreamSample *iface, IDirectDrawSurface **ddraw_surface, RECT *rect) { - FIXME("(%p)->(%p,%p): stub\n", iface, ddraw_surface, rect); + IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p,%p)\n", iface, ddraw_surface, rect); + + if (ddraw_surface) + { + *ddraw_surface = This->surface; + if (*ddraw_surface) + IDirectDrawSurface_AddRef(*ddraw_surface); + } + + if (rect) + *rect = This->rect; + + return S_OK; } static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetRect(IDirectDrawStreamSample *iface, const RECT *rect) @@ -977,19 +996,42 @@ static const struct IDirectDrawStreamSampleVtbl DirectDrawStreamSample_Vtbl = IDirectDrawStreamSampleImpl_SetRect }; -static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawStreamSample **ddraw_stream_sample) +static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawSurface *surface, + const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample) { IDirectDrawStreamSampleImpl *object; + HRESULT hr; TRACE("(%p)\n", ddraw_stream_sample); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawStreamSampleImpl)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; object->parent = (IMediaStream*)parent; + if (surface) + { + object->surface = surface; + IDirectDrawSurface_AddRef(surface); + } + else + FIXME("create ddraw surface\n"); + + if (rect) + object->rect = *rect; + else if (object->surface) + { + DDSURFACEDESC desc = { sizeof(desc) }; + hr = IDirectDrawSurface_GetSurfaceDesc(object->surface, &desc); + if (hr == S_OK) + { + object->rect.left = object->rect.top = 0; + object->rect.right = desc.dwWidth; + object->rect.bottom = desc.dwHeight; + } + } *ddraw_stream_sample = (IDirectDrawStreamSample*)&object->IDirectDrawStreamSample_iface; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f2f5723..a8986a6 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -26,6 +26,14 @@ #include "amstream.h" #include "vfwmsgs.h" +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc = IUnknown_AddRef(obj); + IUnknown_Release(obj); + ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); +} + static const WCHAR filenameW[] = {'t','e','s','t','.','a','v','i',0}; static IDirectDraw7* pdd7; @@ -119,6 +127,8 @@ static void test_renderfile(void) IMediaStream *pvidstream = NULL; IDirectDrawMediaStream *pddstream = NULL; IDirectDrawStreamSample *pddsample = NULL; + IDirectDrawSurface *surface; + RECT rect; if (!(pams = create_ammultimediastream())) return; @@ -151,9 +161,23 @@ static void test_renderfile(void) hr = IDirectDrawMediaStream_CreateSample(pddstream, NULL, NULL, 0, &pddsample); ok(hr == S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); + surface = NULL; + hr = IDirectDrawStreamSample_GetSurface(pddsample, &surface, &rect); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(surface == NULL, "got %p\n", surface); + IDirectDrawStreamSample_Release(pddsample); + + hr = IDirectDrawSurface7_QueryInterface(pdds7, &IID_IDirectDrawSurface, (void**)&surface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + EXPECT_REF(surface, 1); + hr = IDirectDrawMediaStream_CreateSample(pddstream, surface, NULL, 0, &pddsample); + ok(hr == S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); + EXPECT_REF(surface, 2); + IDirectDrawStreamSample_Release(pddsample); + IDirectDrawSurface_Release(surface); + error: - if (pddsample) - IDirectDrawStreamSample_Release(pddsample); if (pddstream) IDirectDrawMediaStream_Release(pddstream); if (pvidstream) @@ -426,6 +450,83 @@ static void test_media_streams(void) IAMMultiMediaStream_Release(pams); } +static void test_IDirectDrawStreamSample(void) +{ + IAMMultiMediaStream *pams; + HRESULT hr; + IMediaStream *pvidstream = NULL; + IDirectDrawMediaStream *pddstream = NULL; + IDirectDrawStreamSample *pddsample = NULL; + IDirectDrawSurface *surface, *surface2; + RECT rect; + + if (!(pams = create_ammultimediastream())) + return; + if (!create_directdraw()) + { + IAMMultiMediaStream_Release(pams); + return; + } + + hr = IAMMultiMediaStream_Initialize(pams, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(pams, (IUnknown*)pdd7, &MSPID_PrimaryVideo, 0, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &pvidstream); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (FAILED(hr)) goto error; + + hr = IMediaStream_QueryInterface(pvidstream, &IID_IDirectDrawMediaStream, (LPVOID*)&pddstream); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (FAILED(hr)) goto error; + + hr = IDirectDrawMediaStream_CreateSample(pddstream, NULL, NULL, 0, &pddsample); + ok(hr == S_OK, "got 0x%08x\n", hr); + + surface = NULL; + hr = IDirectDrawStreamSample_GetSurface(pddsample, &surface, &rect); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(surface != NULL, "got %p\n", surface); +if (surface) + IDirectDrawSurface_Release(surface); + IDirectDrawStreamSample_Release(pddsample); + + hr = IDirectDrawSurface7_QueryInterface(pdds7, &IID_IDirectDrawSurface, (void**)&surface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + EXPECT_REF(surface, 1); + hr = IDirectDrawMediaStream_CreateSample(pddstream, surface, NULL, 0, &pddsample); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(surface, 2); + + surface2 = NULL; + memset(&rect, 0, sizeof(rect)); + hr = IDirectDrawStreamSample_GetSurface(pddsample, &surface2, &rect); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(surface == surface2, "got %p\n", surface2); + ok(rect.right > 0 && rect.bottom > 0, "got %d, %d\n", rect.right, rect.bottom); + EXPECT_REF(surface, 3); + IDirectDrawSurface_Release(surface2); + + hr = IDirectDrawStreamSample_GetSurface(pddsample, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDirectDrawStreamSample_Release(pddsample); + IDirectDrawSurface_Release(surface); + +error: + if (pddstream) + IDirectDrawMediaStream_Release(pddstream); + if (pvidstream) + IMediaStream_Release(pvidstream); + + release_directdraw(); + IAMMultiMediaStream_Release(pams); +} + START_TEST(amstream) { HANDLE file; @@ -433,6 +534,7 @@ START_TEST(amstream) CoInitializeEx(NULL, COINIT_MULTITHREADED); test_media_streams(); + test_IDirectDrawStreamSample(); file = CreateFileW(filenameW, 0, 0, NULL, OPEN_EXISTING, 0, NULL); if (file != INVALID_HANDLE_VALUE)

1 0

Alex Henrie : user32: Send BM_SETCHECK before WM_CAPTURECHANGED and add tests.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: c68843f898da704432c391cab9e534323fec72ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68843f898da704432c391cab… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 23 00:59:08 2015 -0600 user32: Send BM_SETCHECK before WM_CAPTURECHANGED and add tests. --- dlls/user32/button.c | 2 +- dlls/user32/tests/msg.c | 226 +++++++++++++++++++++++++++++++----------------- 2 files changed, 150 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c68843f898da704432c39…

1 0

Nikolay Sivov : amstream: Implement GetDirectDraw().
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: eb0b1d55e41f24f0159ed0582b182bb415e0c23a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0b1d55e41f24f0159ed0582… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 22 23:52:08 2015 +0300 amstream: Implement GetDirectDraw(). --- dlls/amstream/Makefile.in | 2 +- dlls/amstream/mediastream.c | 21 ++++++++++++++++++--- dlls/amstream/tests/amstream.c | 16 ++++++++++++++++ 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in index 1107223..c00822b 100644 --- a/dlls/amstream/Makefile.in +++ b/dlls/amstream/Makefile.in @@ -1,5 +1,5 @@ MODULE = amstream.dll -IMPORTS = strmiids strmbase uuid ole32 advapi32 +IMPORTS = strmiids strmbase uuid ole32 advapi32 ddraw C_SRCS = \ amstream.c \ diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 4a8c19b..1a31706 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -42,6 +42,7 @@ typedef struct { IMultiMediaStream* parent; MSPID purpose_id; STREAM_TYPE stream_type; + IDirectDraw7 *ddraw; } DirectDrawMediaStreamImpl; static inline DirectDrawMediaStreamImpl *impl_from_DirectDrawMediaStream_IAMMediaStream(IAMMediaStream *iface) @@ -94,7 +95,11 @@ static ULONG WINAPI DirectDrawMediaStreamImpl_IAMMediaStream_Release(IAMMediaStr TRACE("(%p/%p)->(): new ref = %u\n", iface, This, ref); if (!ref) + { + if (This->ddraw) + IDirectDraw7_Release(This->ddraw); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -373,11 +378,21 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_SetFormat } static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetDirectDraw(IDirectDrawMediaStream *iface, - IDirectDraw **ppDirectDraw) + IDirectDraw **ddraw) { - FIXME("(%p)->(%p) stub!\n", iface, ppDirectDraw); + DirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", iface, ddraw); + + *ddraw = NULL; + if (!This->ddraw) + { + HRESULT hr = DirectDrawCreateEx(NULL, (void**)&This->ddraw, &IID_IDirectDraw7, NULL); + if (FAILED(hr)) + return hr; + } + + return IDirectDraw7_QueryInterface(This->ddraw, &IID_IDirectDraw, (void**)ddraw); } static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_SetDirectDraw(IDirectDrawMediaStream *iface, diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index a8986a6..b961084 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -458,6 +458,8 @@ static void test_IDirectDrawStreamSample(void) IDirectDrawMediaStream *pddstream = NULL; IDirectDrawStreamSample *pddsample = NULL; IDirectDrawSurface *surface, *surface2; + IDirectDraw *ddraw, *ddraw2; + IDirectDraw7 *ddraw7; RECT rect; if (!(pams = create_ammultimediastream())) @@ -482,6 +484,20 @@ static void test_IDirectDrawStreamSample(void) ok(hr == S_OK, "got 0x%08x\n", hr); if (FAILED(hr)) goto error; + hr = IDirectDrawMediaStream_GetDirectDraw(pddstream, &ddraw); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDirectDrawMediaStream_GetDirectDraw(pddstream, &ddraw2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ddraw == ddraw2, "got %p, %p\n", ddraw, ddraw2); + + hr = IDirectDraw_QueryInterface(ddraw, &IID_IDirectDraw7, (void**)&ddraw7); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDirectDraw7_Release(ddraw7); + + IDirectDraw_Release(ddraw2); + IDirectDraw_Release(ddraw); + hr = IDirectDrawMediaStream_CreateSample(pddstream, NULL, NULL, 0, &pddsample); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Nikolay Sivov : dwrite/tests: Show that line baseline is relative to this line.
by Alexandre Julliard June 23, 2015

June 23, 2015

Module: wine Branch: master Commit: 88663caf7470ac16c9b392cc70dfae3921276815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88663caf7470ac16c9b392cc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 21 22:43:01 2015 +0300 dwrite/tests: Show that line baseline is relative to this line. --- dlls/dwrite/tests/layout.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 505c2eb..ecf4183 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2730,8 +2730,9 @@ static IDWriteFontFace *get_fontface_from_format(IDWriteTextFormat *format) static void test_GetLineMetrics(void) { static const WCHAR strW[] = {'a','b','c','d',' ',0}; + static const WCHAR str2W[] = {'a','b','\r','c','d',0}; DWRITE_FONT_METRICS fontmetrics; - DWRITE_LINE_METRICS metrics; + DWRITE_LINE_METRICS metrics[2]; IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFontFace *fontface; @@ -2749,31 +2750,47 @@ static void test_GetLineMetrics(void) ok(hr == S_OK, "got 0x%08x\n", hr); count = 0; - hr = IDWriteTextLayout_GetLineMetrics(layout, &metrics, 0, &count); + hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, 0, &count); ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); ok(count == 1, "got count %u\n", count); - memset(&metrics, 0, sizeof(metrics)); - hr = IDWriteTextLayout_GetLineMetrics(layout, &metrics, 1, &count); + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, 1, &count); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(metrics.length == 5, "got %u\n", metrics.length); - ok(metrics.trailingWhitespaceLength == 1, "got %u\n", metrics.trailingWhitespaceLength); + ok(metrics[0].length == 5, "got %u\n", metrics[0].length); + ok(metrics[0].trailingWhitespaceLength == 1, "got %u\n", metrics[0].trailingWhitespaceLength); - ok(metrics.newlineLength == 0, "got %u\n", metrics.newlineLength); - ok(metrics.isTrimmed == FALSE, "got %d\n", metrics.isTrimmed); + ok(metrics[0].newlineLength == 0, "got %u\n", metrics[0].newlineLength); + ok(metrics[0].isTrimmed == FALSE, "got %d\n", metrics[0].isTrimmed); /* Tahoma doesn't provide BASE table, so baseline is calculated from font metrics */ fontface = get_fontface_from_format(format); ok(fontface != NULL, "got %p\n", fontface); IDWriteFontFace_GetMetrics(fontface, &fontmetrics); - ok(metrics.baseline == fontmetrics.ascent, "got %.2f, expected %d\n", metrics.baseline, + ok(metrics[0].baseline == fontmetrics.ascent, "got %.2f, expected %d\n", metrics[0].baseline, fontmetrics.ascent); - ok(metrics.height == fontmetrics.ascent + fontmetrics.descent, "got %.2f, expected %d\n", - metrics.height, fontmetrics.ascent + fontmetrics.descent); + ok(metrics[0].height == fontmetrics.ascent + fontmetrics.descent, "got %.2f, expected %d\n", + metrics[0].height, fontmetrics.ascent + fontmetrics.descent); + IDWriteTextLayout_Release(layout); - IDWriteFontFace_Release(fontface); + /* force 2 lines */ + hr = IDWriteFactory_CreateTextLayout(factory, str2W, 5, format, 10000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(metrics, 0, sizeof(metrics)); + count = 2; + hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, 2, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(count == 2, "got %u\n", count); + /* baseline is relative to a line, and is not accumulated */ + ok(metrics[0].baseline == metrics[1].baseline, "got %.2f, %.2f\n", metrics[0].baseline, + metrics[1].baseline); +} IDWriteTextLayout_Release(layout); + + IDWriteFontFace_Release(fontface); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); }

1 0

Piotr Caban : msvcr110: Add __crtGetLocaleInfoEx implementation.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: d940ac24126d7b3a1c568edc5b1bdbd7118977ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=d940ac24126d7b3a1c568edc5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jun 22 12:52:30 2015 +0200 msvcr110: Add __crtGetLocaleInfoEx implementation. --- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcrt/locale.c | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 516af25..e5ef1bb 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -917,7 +917,7 @@ @ stub -arch=i386,win64 __crtFlsGetValue @ stub -arch=i386,win64 __crtFlsSetValue @ stub -arch=i386,win64 __crtGetDateFormatEx -@ stub -arch=i386,win64 __crtGetLocaleInfoEx +@ cdecl -arch=i386,win64 __crtGetLocaleInfoEx(wstr long ptr long) @ cdecl __crtGetShowWindowMode() MSVCR110__crtGetShowWindowMode @ stub -arch=i386,win64 __crtGetTimeFormatEx @ stub -arch=i386,win64 __crtGetUserDefaultLocaleName diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 6646df3..ff034b7 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -902,7 +902,7 @@ @ stub -arch=i386,win64 __crtFlsSetValue @ stub -arch=i386,win64 __crtGetDateFormatEx @ stub __crtGetFileInformationByHandleEx -@ stub -arch=i386,win64 __crtGetLocaleInfoEx +@ cdecl -arch=i386,win64 __crtGetLocaleInfoEx(wstr long ptr long) @ cdecl __crtGetShowWindowMode() MSVCR110__crtGetShowWindowMode @ stub __crtGetTickCount64 @ stub -arch=i386,win64 __crtGetTimeFormatEx diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index ad0cc98..bd919e6 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -628,6 +628,15 @@ int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, MSVCRT_wchar_t *buffer, i } /********************************************************************* + * __crtGetLocaleInfoEx (MSVC110.@) + */ +int CDECL __crtGetLocaleInfoEx( const WCHAR *locale, LCTYPE type, MSVCRT_wchar_t *buffer, int len ) +{ + TRACE("(%s, %x, %p, %d)\n", debugstr_w(locale), type, buffer, len); + return GetLocaleInfoEx(locale, type, buffer, len); +} + +/********************************************************************* * btowc(MSVCRT.@) */ MSVCRT_wint_t CDECL MSVCRT_btowc(int c)

1 0

Bernhard Übelacker : advapi32: Fix RegEnumValueW when enumerating long values.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: 443ef6e7a6026f6aaa5ffcfcbc33d582da780ac5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=443ef6e7a6026f6aaa5ffcfcb… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Sun Jun 21 18:25:48 2015 +0200 advapi32: Fix RegEnumValueW when enumerating long values. --- dlls/advapi32/registry.c | 68 +++++++++++++++++++----------------------- dlls/advapi32/tests/registry.c | 13 ++++++++ 2 files changed, 44 insertions(+), 37 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index 30130b1..f8bf21a 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1922,53 +1922,47 @@ LSTATUS WINAPI RegEnumValueW( HKEY hkey, DWORD index, LPWSTR value, LPDWORD val_ status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, buffer, total_size, &total_size ); - if (status && status != STATUS_BUFFER_OVERFLOW) goto done; - if (value || data) + /* retry with a dynamically allocated buffer */ + while (status == STATUS_BUFFER_OVERFLOW) { - /* retry with a dynamically allocated buffer */ - while (status == STATUS_BUFFER_OVERFLOW) - { - if (buf_ptr != buffer) heap_free( buf_ptr ); - if (!(buf_ptr = heap_alloc( total_size ))) - return ERROR_NOT_ENOUGH_MEMORY; - info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; - status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, - buf_ptr, total_size, &total_size ); - } + if (buf_ptr != buffer) heap_free( buf_ptr ); + if (!(buf_ptr = heap_alloc( total_size ))) return ERROR_NOT_ENOUGH_MEMORY; + info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; + status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, + buf_ptr, total_size, &total_size ); + } - if (status) goto done; + if (status) goto done; - if (value) + if (value) + { + if (info->NameLength/sizeof(WCHAR) >= *val_count) { - if (info->NameLength/sizeof(WCHAR) >= *val_count) - { - status = STATUS_BUFFER_OVERFLOW; - goto overflow; - } - memcpy( value, info->Name, info->NameLength ); - *val_count = info->NameLength / sizeof(WCHAR); - value[*val_count] = 0; + status = STATUS_BUFFER_OVERFLOW; + goto overflow; } + memcpy( value, info->Name, info->NameLength ); + *val_count = info->NameLength / sizeof(WCHAR); + value[*val_count] = 0; + } - if (data) + if (data) + { + if (total_size - info->DataOffset > *count) { - if (total_size - info->DataOffset > *count) - { - status = STATUS_BUFFER_OVERFLOW; - goto overflow; - } - memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); - if (total_size - info->DataOffset <= *count-sizeof(WCHAR) && is_string(info->Type)) - { - /* if the type is REG_SZ and data is not 0-terminated - * and there is enough space in the buffer NT appends a \0 */ - WCHAR *ptr = (WCHAR *)(data + total_size - info->DataOffset); - if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; - } + status = STATUS_BUFFER_OVERFLOW; + goto overflow; + } + memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); + if (total_size - info->DataOffset <= *count-sizeof(WCHAR) && is_string(info->Type)) + { + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + WCHAR *ptr = (WCHAR *)(data + total_size - info->DataOffset); + if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; } } - else status = STATUS_SUCCESS; overflow: if (type) *type = info->Type; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index c801384..561101b 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -522,6 +522,8 @@ static void test_enum_value(void) static const WCHAR foobarW[] = {'f','o','o','b','a','r',0}; static const WCHAR testW[] = {'T','e','s','t',0}; static const WCHAR xxxW[] = {'x','x','x','x','x','x','x','x',0}; + WCHAR longW[128]; + int i; /* create the working key for new 'Test' value */ res = RegCreateKeyA( hkey_main, "TestKey", &test_key ); @@ -710,6 +712,17 @@ static void test_enum_value(void) ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); ok( !memcmp( dataW, foobarW, sizeof(foobarW) ), "data is not 'foobar'\n" ); + /* tests the overflow case for the fixed "char buffer[]" in RegEnumValueW */ + for (i = 0; i < sizeof(longW)/sizeof(WCHAR); i++) longW[i] = 'x'; + longW[i - 1] = 0; + res = RegSetValueExW( test_key, testW, 0, REG_SZ, (const BYTE *)longW, sizeof(longW) ); + ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); + data_count = 20; + type = 1234; + res = RegEnumValueW( test_key, 0, NULL, NULL, NULL, &type, NULL, &data_count); + ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); + ok( data_count == sizeof(longW), "data_count set to %d\n", data_count ); + cleanup: RegDeleteKeyA(test_key, ""); RegCloseKey(test_key);

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem.Primary.
by Alexandre Julliard June 22, 2015

June 22, 2015

Module: wine Branch: master Commit: bd647dc013d275781c0608a767e5f5af8a3e65c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd647dc013d275781c0608a76… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 22 12:13:56 2015 +0200 wbemprox: Implement Win32_OperatingSystem.Primary. --- dlls/wbemprox/builtin.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 0c6f8a7..41a8e97 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -271,6 +271,8 @@ static const WCHAR prop_pnpdeviceidW[] = {'P','N','P','D','e','v','i','c','e','I','D',0}; static const WCHAR prop_pprocessidW[] = {'P','a','r','e','n','t','P','r','o','c','e','s','s','I','D',0}; +static const WCHAR prop_primaryW[] = + {'P','r','i','m','a','r','y',0}; static const WCHAR prop_processidW[] = {'P','r','o','c','e','s','s','I','D',0}; static const WCHAR prop_processoridW[] = @@ -480,6 +482,7 @@ static const struct column col_os[] = { prop_oslanguageW, CIM_UINT32, VT_I4 }, { prop_osproductsuiteW, CIM_UINT32, VT_I4 }, { prop_ostypeW, CIM_UINT16, VT_I4 }, + { prop_primaryW, CIM_BOOLEAN }, { prop_serialnumberW, CIM_STRING }, { prop_servicepackmajorW, CIM_UINT16, VT_I4 }, { prop_servicepackminorW, CIM_UINT16, VT_I4 }, @@ -861,6 +864,7 @@ struct record_operatingsystem UINT32 oslanguage; UINT32 osproductsuite; UINT16 ostype; + int primary; const WCHAR *serialnumber; UINT16 servicepackmajor; UINT16 servicepackminor; @@ -2491,6 +2495,7 @@ static enum fill_status fill_os( struct table *table, const struct expr *cond ) rec->oslanguage = GetSystemDefaultLangID(); rec->osproductsuite = 2461140; /* Windows XP Professional */ rec->ostype = 18; /* WINNT */ + rec->primary = -1; rec->serialnumber = os_serialnumberW; rec->servicepackmajor = 3; rec->servicepackminor = 0;

1 0