November 2013 - Wine-commits

Piotr Caban : qcap: Add helper to initalize test_filter structure.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: 4a3b8d2e3c4d099c1c5871345f458dc13bde9a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a3b8d2e3c4d099c1c5871345… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 26 14:36:04 2013 +0100 qcap: Add helper to initalize test_filter structure. --- dlls/qcap/tests/qcap.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 463a75c..80c2b33 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -984,17 +984,29 @@ static const IEnumMediaTypesVtbl EnumMediaTypesVtbl = { EnumMediaTypes_Clone }; +static void init_test_filter(test_filter *This, PIN_DIRECTION dir, filter_type type) +{ + memset(This, 0, sizeof(*This)); + This->IBaseFilter_iface.lpVtbl = &BaseFilterVtbl; + This->IEnumPins_iface.lpVtbl = &EnumPinsVtbl; + This->IPin_iface.lpVtbl = &PinVtbl; + This->IKsPropertySet_iface.lpVtbl = &KsPropertySetVtbl; + This->IEnumMediaTypes_iface.lpVtbl = &EnumMediaTypesVtbl; + + This->dir = dir; + This->filter_type = type; +} + static void test_CaptureGraphBuilder_RenderStream(void) { - test_filter source_filter = {{&BaseFilterVtbl}, {&EnumPinsVtbl}, {&PinVtbl}, - {&KsPropertySetVtbl}, {&EnumMediaTypesVtbl}, PINDIR_OUTPUT, SOURCE_FILTER}; - test_filter sink_filter = {{&BaseFilterVtbl}, {&EnumPinsVtbl}, {&PinVtbl}, - {&KsPropertySetVtbl}, {&EnumMediaTypesVtbl}, PINDIR_INPUT, SINK_FILTER}; - test_filter intermediate_filter = {{&BaseFilterVtbl}, {&EnumPinsVtbl}, {&PinVtbl}, - {&KsPropertySetVtbl}, {&EnumMediaTypesVtbl}, PINDIR_OUTPUT, INTERMEDIATE_FILTER}; + test_filter source_filter, sink_filter, intermediate_filter; ICaptureGraphBuilder2 *cgb; HRESULT hr; + init_test_filter(&source_filter, PINDIR_OUTPUT, SOURCE_FILTER); + init_test_filter(&sink_filter, PINDIR_INPUT, SINK_FILTER); + init_test_filter(&intermediate_filter, PINDIR_OUTPUT, INTERMEDIATE_FILTER); + hr = CoCreateInstance(&CLSID_CaptureGraphBuilder2, NULL, CLSCTX_INPROC_SERVER, &IID_ICaptureGraphBuilder2, (void**)&cgb); ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), @@ -1070,8 +1082,7 @@ static void test_AviMux_QueryInterface(void) static void test_AviMux(void) { - test_filter source_filter = {{&BaseFilterVtbl}, {&EnumPinsVtbl}, {&PinVtbl}, - {&KsPropertySetVtbl}, {&EnumMediaTypesVtbl}, PINDIR_OUTPUT, SOURCE_FILTER}; + test_filter source_filter; VIDEOINFOHEADER videoinfoheader; IPin *avimux_in, *avimux_out, *pin; AM_MEDIA_TYPE source_media_type; @@ -1082,6 +1093,8 @@ static void test_AviMux(void) IEnumMediaTypes *emt; HRESULT hr; + init_test_filter(&source_filter, PINDIR_OUTPUT, SOURCE_FILTER); + hr = CoCreateInstance(&CLSID_AviDest, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&avimux); ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG), "couldn't create AVI Mux filter, hr = %08x\n", hr);

1 0

Piotr Caban : qcap: Fix Avi Mux output pin Connect implementation.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: 6dce36357aa26d7d012776d52646c96b5ac9314c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dce36357aa26d7d012776d52… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 26 14:36:19 2013 +0100 qcap: Fix Avi Mux output pin Connect implementation. --- dlls/qcap/avimux.c | 75 +++++++++++++++++----- dlls/qcap/tests/qcap.c | 167 +++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 218 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6dce36357aa26d7d01277…

1 0

Stefan Dösinger : wined3d: Discard non-sysmem locations in unload.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: 1a55000df1796b75ad95d50c1ae55862d523dba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a55000df1796b75ad95d50c1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 25 23:41:10 2013 +0100 wined3d: Discard non-sysmem locations in unload. --- dlls/wined3d/surface.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3bf4926..5256eb8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1344,11 +1344,9 @@ static void surface_unload(struct wined3d_resource *resource) } else { - /* Load the surface into system memory */ surface_load_location(surface, SFLAG_INSYSMEM); - surface_invalidate_location(surface, surface->draw_binding); } - surface_invalidate_location(surface, SFLAG_INTEXTURE | SFLAG_INSRGBTEX); + surface_invalidate_location(surface, ~SFLAG_INSYSMEM); surface->flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); context = context_acquire(device, NULL);

1 0

Stefan Dösinger : wined3d: Don' t set SFLAG_INSYSMEM in surface_download_data.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: 038e45c6624443be1c594d280a5f3831994d96e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=038e45c6624443be1c594d280… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 25 23:41:11 2013 +0100 wined3d: Don't set SFLAG_INSYSMEM in surface_download_data. surface_load_location takes care of this. --- dlls/wined3d/surface.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5256eb8..50bc6e7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1671,9 +1671,6 @@ static void surface_download_data(struct wined3d_surface *surface, const struct HeapFree(GetProcessHeap(), 0, mem); } } - - /* Surface has now been downloaded */ - surface->flags |= SFLAG_INSYSMEM; } /* This call just uploads data, the caller is responsible for binding the

1 0

Stefan Dösinger : wined3d: Use the pointer returned by map in wined3d_surface_getdc.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: eb446e8640c694bb737ef0a38d127eeb3f186bf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb446e8640c694bb737ef0a38… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 25 23:41:12 2013 +0100 wined3d: Use the pointer returned by map in wined3d_surface_getdc. --- dlls/wined3d/surface.c | 13 ++++++------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 50bc6e7..dcb8ebf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3324,11 +3324,10 @@ HRESULT CDECL wined3d_surface_getdc(struct wined3d_surface *surface, HDC *dc) ERR("Map failed, hr %#x.\n", hr); return hr; } + surface->getdc_map_mem = map.data; - /* Sync the DIB with the PBO. This can't be done earlier because Map() - * activates the allocatedMemory. */ - if (surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM)) - memcpy(surface->dib.bitmap_data, surface->resource.allocatedMemory, surface->resource.size); + if (surface->dib.bitmap_data != surface->getdc_map_mem) + memcpy(surface->dib.bitmap_data, surface->getdc_map_mem, surface->resource.size); if (surface->resource.format->id == WINED3DFMT_P8_UINT || surface->resource.format->id == WINED3DFMT_P8_UINT_A8_UNORM) @@ -3389,11 +3388,11 @@ HRESULT CDECL wined3d_surface_releasedc(struct wined3d_surface *surface, HDC dc) return WINEDDERR_NODC; } - /* Copy the contents of the DIB over to the PBO. */ - if ((surface->flags & (SFLAG_PBO | SFLAG_PIN_SYSMEM)) && surface->resource.allocatedMemory) - memcpy(surface->resource.allocatedMemory, surface->dib.bitmap_data, surface->resource.size); + if (surface->dib.bitmap_data != surface->getdc_map_mem) + memcpy(surface->getdc_map_mem, surface->dib.bitmap_data, surface->resource.size); /* We locked first, so unlock now. */ + surface->getdc_map_mem = NULL; wined3d_surface_unmap(surface); surface->flags &= ~SFLAG_DCINUSE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d7e1c5f..5b5d01a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2204,6 +2204,7 @@ struct wined3d_surface /* For GetDC */ struct wined3d_surface_dib dib; HDC hDC; + void *getdc_map_mem; /* Color keys for DDraw */ struct wined3d_color_key dst_blt_color_key;

1 0

Frédéric Delanoy : twain_32: Use BOOL type where appropriate.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: 6a847bd9cd814eb0160bf3673e514937f1359775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a847bd9cd814eb0160bf3673… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 25 22:27:36 2013 +0100 twain_32: Use BOOL type where appropriate. --- dlls/twain_32/dsm_ctrl.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index db57d08..09e49c8 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -100,12 +100,12 @@ twain_add_onedriver(const char *dsname) { FreeLibrary (hmod); } -static int detectionrun = 0; +static BOOL detectionrun = FALSE; static void twain_autodetect(void) { if (detectionrun) return; - detectionrun = 1; + detectionrun = TRUE; twain_add_onedriver("sane.ds"); twain_add_onedriver("gphoto2.ds");

1 0

Frédéric Delanoy : strmbase: Use BOOL type where appropriate.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: 50d45a8abc089a32c07aafce8a127bbd3ff1412f URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d45a8abc089a32c07aafce8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 25 22:27:35 2013 +0100 strmbase: Use BOOL type where appropriate. --- dlls/strmbase/pin.c | 8 ++++---- dlls/strmbase/pospass.c | 10 +++++----- dlls/strmbase/qualitycontrol.c | 5 +++-- dlls/strmbase/renderer.c | 4 ++-- dlls/strmbase/transform.c | 2 +- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index d99a0bb..eb9b23c 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -981,7 +981,7 @@ HRESULT WINAPI BaseInputPinImpl_EndOfStream(IPin * iface) if (This->flushing) hr = S_FALSE; else - This->end_of_stream = 1; + This->end_of_stream = TRUE; LeaveCriticalSection(This->pin.pCritSec); if (hr == S_OK) @@ -1001,7 +1001,7 @@ HRESULT WINAPI BaseInputPinImpl_BeginFlush(IPin * iface) TRACE("() semi-stub\n"); EnterCriticalSection(This->pin.pCritSec); - This->flushing = 1; + This->flushing = TRUE; hr = SendFurther( iface, deliver_beginflush, NULL, NULL ); LeaveCriticalSection(This->pin.pCritSec); @@ -1021,7 +1021,7 @@ HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface) TRACE("(%p)\n", This); EnterCriticalSection(This->pin.pCritSec); - This->flushing = This->end_of_stream = 0; + This->flushing = This->end_of_stream = FALSE; hr = SendFurther( iface, deliver_endflush, NULL, NULL ); LeaveCriticalSection(This->pin.pCritSec); @@ -1232,7 +1232,7 @@ static HRESULT InputPin_Init(const IPinVtbl *InputPin_Vtbl, const PIN_INFO * pPi IMemAllocator_AddRef(pPinImpl->preferred_allocator); pPinImpl->pin.IPin_iface.lpVtbl = InputPin_Vtbl; pPinImpl->IMemInputPin_iface.lpVtbl = &MemInputPin_Vtbl; - pPinImpl->flushing = pPinImpl->end_of_stream = 0; + pPinImpl->flushing = pPinImpl->end_of_stream = FALSE; return S_OK; } diff --git a/dlls/strmbase/pospass.c b/dlls/strmbase/pospass.c index 71c1dc6..b7ba811 100644 --- a/dlls/strmbase/pospass.c +++ b/dlls/strmbase/pospass.c @@ -263,7 +263,7 @@ HRESULT WINAPI PosPassThru_Construct(IUnknown *pUnkOuter, LPVOID *ppPassThru) fimpl->IMediaPosition_iface.lpVtbl = &IMediaPositionPassThru_Vtbl; fimpl->ref = 1; fimpl->pin = NULL; - fimpl->timevalid = 0; + fimpl->timevalid = FALSE; InitializeCriticalSection(&fimpl->time_cs); fimpl->time_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": PassThruImpl.time_cs"); BaseDispatch_Init(&fimpl->baseDispatch, &IID_IMediaPosition); @@ -599,7 +599,7 @@ HRESULT WINAPI RendererPosPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE_ PassThruImpl *This = impl_from_IUnknown_inner(iface); EnterCriticalSection(&This->time_cs); This->time_earliest = start; - This->timevalid = 1; + This->timevalid = TRUE; LeaveCriticalSection(&This->time_cs); return S_OK; } @@ -608,7 +608,7 @@ HRESULT WINAPI RendererPosPassThru_ResetMediaTime(IUnknown *iface) { PassThruImpl *This = impl_from_IUnknown_inner(iface); EnterCriticalSection(&This->time_cs); - This->timevalid = 0; + This->timevalid = FALSE; LeaveCriticalSection(&This->time_cs); return S_OK; } @@ -621,10 +621,10 @@ HRESULT WINAPI RendererPosPassThru_EOS(IUnknown *iface) hr = IMediaSeeking_GetStopPosition(&This->IMediaSeeking_iface, &time); EnterCriticalSection(&This->time_cs); if (SUCCEEDED(hr)) { - This->timevalid = 1; + This->timevalid = TRUE; This->time_earliest = time; } else - This->timevalid = 0; + This->timevalid = FALSE; LeaveCriticalSection(&This->time_cs); return hr; } diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index f96ed64..9bdc251 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -112,8 +112,9 @@ void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart) This->avg_render = This->last_in_time = This->last_left = This->avg_duration = This->avg_pt = -1; This->clockstart = tStart; This->avg_rate = -1.0; - This->rendered = This->dropped = This->is_dropped = 0; - This->qos_handled = 1; /* Lie that will be corrected on first adjustment */ + This->rendered = This->dropped = 0; + This->is_dropped = FALSE; + This->qos_handled = TRUE; /* Lie that will be corrected on first adjustment */ } diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 56f72f1..6334284 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -472,7 +472,7 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) if (This->pInputPin->pin.pConnectedTo) { - This->pInputPin->end_of_stream = 0; + This->pInputPin->end_of_stream = FALSE; } else if (This->filter.filterInfo.pGraph) { @@ -515,7 +515,7 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) { if (This->pInputPin->pin.pConnectedTo) ResetEvent(This->evComplete); - This->pInputPin->end_of_stream = 0; + This->pInputPin->end_of_stream = FALSE; } else if (This->pFuncsTable->pfnOnStopStreaming) This->pFuncsTable->pfnOnStopStreaming(This); diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 2290bed..8cf9ee8 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -406,7 +406,7 @@ HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStar { if (This->filter.state == State_Stopped) { - impl_BaseInputPin_from_IPin(This->ppPins[0])->end_of_stream = 0; + impl_BaseInputPin_from_IPin(This->ppPins[0])->end_of_stream = FALSE; if (This->pFuncsTable->pfnStartStreaming) hr = This->pFuncsTable->pfnStartStreaming(This); if (SUCCEEDED(hr))

1 0

Frédéric Delanoy : version: Use BOOL type where appropriate.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: 13b9fee833717224aecccd8cdab9f966114f3045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13b9fee833717224aecccd8cd… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 25 22:27:38 2013 +0100 version: Use BOOL type where appropriate. --- dlls/version/version.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/version/version.c b/dlls/version/version.c index 19836ce..c2e9c9d 100644 --- a/dlls/version/version.c +++ b/dlls/version/version.c @@ -235,7 +235,7 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) /* Read in PE header */ pehdoffset = LZSeek( lzfd, 0, SEEK_CUR ); len = LZRead( lzfd, (LPSTR)&pehd, sizeof(pehd) ); - if (len < sizeof(pehd.nt32.FileHeader)) return 0; + if (len < sizeof(pehd.nt32.FileHeader)) return FALSE; if (len < sizeof(pehd)) memset( (char *)&pehd + len, 0, sizeof(pehd) - len ); switch (pehd.nt32.OptionalHeader.Magic) @@ -247,7 +247,7 @@ static BOOL find_pe_resource( HFILE lzfd, DWORD *resLen, DWORD *resOff ) resDataDir = pehd.nt64.OptionalHeader.DataDirectory + IMAGE_DIRECTORY_ENTRY_RESOURCE; break; default: - return 0; + return FALSE; } if ( !resDataDir->Size )

1 0

Frédéric Delanoy : user.exe16: Use BOOL type where appropriate.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: 861106c7eca448d1ceb5813f100b65b26fec93f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=861106c7eca448d1ceb5813f1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Nov 25 22:27:37 2013 +0100 user.exe16: Use BOOL type where appropriate. --- dlls/user.exe16/user.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 7a518b3..d16a1b4 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -560,11 +560,11 @@ BOOL16 WINAPI ClipCursor16( const RECT16 *rect ) BOOL16 WINAPI GetCursorPos16( POINT16 *pt ) { POINT pos; - if (!pt) return 0; + if (!pt) return FALSE; GetCursorPos(&pos); pt->x = pos.x; pt->y = pos.y; - return 1; + return TRUE; }

1 0

André Hentschel : winedump: Update minidump output.
by Alexandre Julliard 26 Nov '13

26 Nov '13

Module: wine Branch: master Commit: b32db69d12c3e16eaf79a46cc18cdeeb15049933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32db69d12c3e16eaf79a46cc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 26 01:08:05 2013 +0100 winedump: Update minidump output. --- tools/winedump/minidump.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/tools/winedump/minidump.c b/tools/winedump/minidump.c index aaa9dff..04213f3 100644 --- a/tools/winedump/minidump.c +++ b/tools/winedump/minidump.c @@ -290,6 +290,12 @@ void mdmp_dump(void) case PROCESSOR_ARCHITECTURE_AMD64: str = "X86_64"; break; + case PROCESSOR_ARCHITECTURE_MSIL: + str = "MSIL"; + break; + case PROCESSOR_ARCHITECTURE_NEUTRAL: + str = "Neutral"; + break; default: str = "???"; break; @@ -310,7 +316,7 @@ void mdmp_dump(void) case 0: str = (msi->PlatformId == VER_PLATFORM_WIN32_NT) ? "NT 4.0" : "95"; break; case 10: str = "98"; break; case 90: str = "ME"; break; - default: str = "5-????"; break; + default: str = "4-????"; break; } break; case 5: @@ -318,9 +324,29 @@ void mdmp_dump(void) { case 0: str = "2000"; break; case 1: str = "XP"; break; - case 2: str = "Server 2003"; break; + case 2: + if (msi->u.s.ProductType == 1) str = "XP"; + else if (msi->u.s.ProductType == 3) str = "Server 2003"; + else str = "5-????"; + break; default: str = "5-????"; break; } + case 6: + switch (msi->MinorVersion) + { + case 0: + if (msi->u.s.ProductType == 1) str = "Vista"; + else if (msi->u.s.ProductType == 3) str = "Server 2008"; + else str = "6-????"; + break; + case 1: + if (msi->u.s.ProductType == 1) str = "Win7"; + else if (msi->u.s.ProductType == 3) str = "Server 2008"; + else str = "6-????"; + break; + case 2: str = "Win8"; break; + default: str = "6-????"; break; + } break; default: str = "???"; break; }

1 0