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

Henri Verbeet : secur32: Handle padding only records in schan_DecryptMessage().
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: e2bd967a856e52251c4ea12cd5413637a8c5d405 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2bd967a856e52251c4ea12cd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 26 15:32:06 2012 +0200 secur32: Handle padding only records in schan_DecryptMessage(). --- dlls/secur32/schannel.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 253e71a..2339b73 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -1080,23 +1080,18 @@ static SECURITY_STATUS SEC_ENTRY schan_DecryptMessage(PCtxtHandle context_handle { SIZE_T length = data_size - received; SECURITY_STATUS status = schan_imp_recv(ctx->session, data + received, &length); + if (status == SEC_I_CONTINUE_NEEDED) - { - if (!received) - { - HeapFree(GetProcessHeap(), 0, data); - TRACE("Returning SEC_E_INCOMPLETE_MESSAGE\n"); - return SEC_E_INCOMPLETE_MESSAGE; - } break; - } - else if (status != SEC_E_OK) + + if (status != SEC_E_OK) { HeapFree(GetProcessHeap(), 0, data); ERR("Returning %d\n", status); return status; } - else if (!length) + + if (!length) break; received += length;

1 0

Henri Verbeet : secur32: Handle incomplete messages in schan_InitializeSecurityContextW().
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: 394519db67ad0b56dea604185b8ea8de4dc53519 URL: http://source.winehq.org/git/wine.git/?a=commit;h=394519db67ad0b56dea604185… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 26 16:03:49 2012 +0200 secur32: Handle incomplete messages in schan_InitializeSecurityContextW(). --- dlls/secur32/schannel.c | 24 +++++++++++++++++++ dlls/secur32/tests/schannel.c | 51 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 72 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index f703ab7..af34e66 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -714,6 +714,30 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( } else { + unsigned int expected_size; + unsigned char *ptr; + SecBuffer *buffer; + int idx; + + if (!pInput) + return SEC_E_INCOMPLETE_MESSAGE; + + idx = schan_find_sec_buffer_idx(pInput, 0, SECBUFFER_TOKEN); + if (idx == -1) + return SEC_E_INCOMPLETE_MESSAGE; + + buffer = &pInput->pBuffers[idx]; + if (buffer->cbBuffer < 5) + return SEC_E_INCOMPLETE_MESSAGE; + + ptr = buffer->pvBuffer; + expected_size = 5 + ((ptr[3] << 8) | ptr[4]); + if (buffer->cbBuffer < expected_size) + { + TRACE("Expected %u bytes, but buffer only contains %u bytes.\n", expected_size, buffer->cbBuffer); + return SEC_E_INCOMPLETE_MESSAGE; + } + ctx = schan_get_object(phContext->dwLower, SCHAN_HANDLE_CTX); } diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index a729394..99394c3 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -640,21 +640,66 @@ static void test_communication(void) buffers[1].cBuffers = 1; buffers[1].pBuffers[0].BufferType = SECBUFFER_TOKEN; - data_size = buffers[0].pBuffers[0].cbBuffer; status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); ok(status == SEC_E_INVALID_TOKEN, "Expected SEC_E_INVALID_TOKEN, got %08x\n", status); buffers[0].pBuffers[0].cbBuffer = buf_size; - buffers[1].cBuffers = 4; - buffers[1].pBuffers[0].cbBuffer = buf_size; status = pInitializeSecurityContextA(&cred_handle, NULL, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, NULL, 0, &context, &buffers[0], &attrs, NULL); ok(status == SEC_I_CONTINUE_NEEDED, "Expected SEC_I_CONTINUE_NEEDED, got %08x\n", status); + buf = &buffers[0].pBuffers[0]; + send(sock, buf->pvBuffer, buf->cbBuffer, 0); + buf->cbBuffer = buf_size; + + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, NULL, 0, NULL, &buffers[0], &attrs, NULL); + ok(status == SEC_E_INCOMPLETE_MESSAGE, "Got unexpected status %#x.\n", status); + ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); + ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + + buffers[1].cBuffers = 4; + buffers[1].pBuffers[0].cbBuffer = 0; + + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); + ok(status == SEC_E_INCOMPLETE_MESSAGE, "Got unexpected status %#x.\n", status); + ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); + ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + + buf = &buffers[1].pBuffers[0]; + buf->cbBuffer = buf_size; + ret = receive_data(sock, buf); + if (ret == -1) + return; + + buffers[1].pBuffers[0].cbBuffer = 4; + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); + ok(status == SEC_E_INCOMPLETE_MESSAGE, "Got unexpected status %#x.\n", status); + ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); + ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + + buffers[1].pBuffers[0].cbBuffer = 5; + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); + ok(status == SEC_E_INCOMPLETE_MESSAGE, "Got unexpected status %#x.\n", status); + ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); + ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + + buffers[1].pBuffers[0].cbBuffer = ret; + status = pInitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", + ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, + 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); + buffers[1].pBuffers[0].cbBuffer = buf_size; while (status == SEC_I_CONTINUE_NEEDED) { buf = &buffers[0].pBuffers[0];

1 0

Henri Verbeet : wined3d: Release the stateblock only after mode setting in wined3d_device_reset().
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: d93e61f2499f747e7d70960f3a6547ed2b3a0b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d93e61f2499f747e7d70960f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jun 26 15:32:10 2012 +0200 wined3d: Release the stateblock only after mode setting in wined3d_device_reset(). While we're allowed to leave the device in a somewhat inconsistent state after a failed reset, such a state should be recoverable by calling reset again. If e.g. mode setting were to fail between the point where we destroy and recreate the stateblock a subsequent reset would crash because the device doesn't have a stateblock anymore. --- dlls/wined3d/device.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cae76ff..dbd2359 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5293,10 +5293,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, if (swapchain_desc->enable_auto_depth_stencil) wined3d_device_set_depth_stencil(device, device->auto_depth_stencil); - TRACE("Resetting stateblock\n"); - wined3d_stateblock_decref(device->updateStateBlock); - wined3d_stateblock_decref(device->stateBlock); - if (swapchain_desc->windowed) { mode.width = swapchain->orig_width; @@ -5377,9 +5373,6 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, } } - if (device->d3d_initialized) - delete_opengl_contexts(device, swapchain); - if (!swapchain_desc->windowed != !swapchain->desc.windowed || DisplayModeChanged) { @@ -5443,6 +5436,13 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device->exStyle = exStyle; } + TRACE("Resetting stateblock.\n"); + wined3d_stateblock_decref(device->updateStateBlock); + wined3d_stateblock_decref(device->stateBlock); + + if (device->d3d_initialized) + delete_opengl_contexts(device, swapchain); + /* Note: No parent needed for initial internal stateblock */ hr = wined3d_stateblock_create(device, WINED3D_SBT_INIT, &device->stateBlock); if (FAILED(hr))

1 0

Hans Leidekker : wbemprox: Implement IWbemServices::OpenNamespace.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: 21ea8b3c3c1f376cc97d6bf8ba328d2af2e598ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=21ea8b3c3c1f376cc97d6bf8b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 26 16:01:43 2012 +0200 wbemprox: Implement IWbemServices::OpenNamespace. --- dlls/wbemprox/services.c | 17 +++++++++++++---- dlls/wbemprox/wbemlocator.c | 2 +- dlls/wbemprox/wbemprox_private.h | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index e33ff36..b4bc8fb 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -201,8 +201,17 @@ static HRESULT WINAPI wbem_services_OpenNamespace( IWbemServices **ppWorkingNamespace, IWbemCallResult **ppResult ) { - FIXME("\n"); - return WBEM_E_FAILED; + static const WCHAR cimv2W[] = {'c','i','m','v','2',0}; + static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; + struct wbem_services *ws = impl_from_IWbemServices( iface ); + + TRACE("%p, %s, 0x%08x, %p, %p, %p\n", iface, debugstr_w(strNamespace), lFlags, + pCtx, ppWorkingNamespace, ppResult); + + if ((strcmpiW( strNamespace, cimv2W ) && strcmpiW( strNamespace, defaultW )) || ws->namespace) + return WBEM_E_INVALID_NAMESPACE; + + return WbemServices_create( NULL, cimv2W, (void **)ppWorkingNamespace ); } static HRESULT WINAPI wbem_services_CancelAsyncCall( @@ -488,7 +497,7 @@ static const IWbemServicesVtbl wbem_services_vtbl = wbem_services_ExecMethodAsync }; -HRESULT WbemServices_create( IUnknown *pUnkOuter, WCHAR *namespace, LPVOID *ppObj ) +HRESULT WbemServices_create( IUnknown *pUnkOuter, const WCHAR *namespace, LPVOID *ppObj ) { struct wbem_services *ws; @@ -499,7 +508,7 @@ HRESULT WbemServices_create( IUnknown *pUnkOuter, WCHAR *namespace, LPVOID *ppOb ws->IWbemServices_iface.lpVtbl = &wbem_services_vtbl; ws->refs = 1; - ws->namespace = namespace; + ws->namespace = heap_strdupW( namespace ); *ppObj = &ws->IWbemServices_iface; diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 87a4d01..0034983 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -192,10 +192,10 @@ static HRESULT WINAPI wbem_locator_ConnectServer( FIXME("unsupported flags\n"); hr = WbemServices_create( NULL, namespace, (void **)ppNamespace ); + heap_free( namespace ); if (SUCCEEDED( hr )) return WBEM_NO_ERROR; - heap_free( namespace ); return WBEM_E_FAILED; } diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index d0cdb76..9273744 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -121,7 +121,7 @@ HRESULT get_propval( const struct view *, UINT, const WCHAR *, VARIANT *, HRESULT get_properties( const struct view *, SAFEARRAY ** ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; -HRESULT WbemServices_create(IUnknown *, WCHAR *, LPVOID *) DECLSPEC_HIDDEN; +HRESULT WbemServices_create(IUnknown *, const WCHAR *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemClassObject_create(IUnknown *, IEnumWbemClassObject *, UINT, LPVOID *) DECLSPEC_HIDDEN; HRESULT EnumWbemClassObject_create(IUnknown *, struct query *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Implement Win32_OperatingSystem. OSLanguage and Win32_OperatingSystem.SystemDirectory.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: eb9fa4dd05197b59aab756feb7102197b4feefa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb9fa4dd05197b59aab756feb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 26 16:02:41 2012 +0200 wbemprox: Implement Win32_OperatingSystem.OSLanguage and Win32_OperatingSystem.SystemDirectory. --- dlls/wbemprox/builtin.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 6092173..faaf5bb 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -74,6 +74,8 @@ static const WCHAR prop_netconnectionstatusW[] = {'N','e','t','C','o','n','n','e','c','t','i','o','n','S','t','a','t','u','s',0}; static const WCHAR prop_osarchitectureW[] = {'O','S','A','r','c','h','i','t','e','c','t','u','r','e',0}; +static const WCHAR prop_oslanguageW[] = + {'O','S','L','a','n','g','u','a','g','e',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_processidW[] = @@ -82,6 +84,8 @@ static const WCHAR prop_releasedateW[] = {'R','e','l','e','a','s','e','D','a','t','e',0}; static const WCHAR prop_serialnumberW[] = {'S','e','r','i','a','l','N','u','m','b','e','r',0}; +static const WCHAR prop_systemdirectoryW[] = + {'S','y','s','t','e','m','D','i','r','e','c','t','o','r','y',0}; static const WCHAR prop_threadcountW[] = {'T','h','r','e','a','d','C','o','u','n','t',0}; @@ -106,8 +110,10 @@ static const struct column col_networkadapter[] = }; static const struct column col_os[] = { - { prop_captionW, CIM_STRING }, - { prop_osarchitectureW, CIM_STRING } + { prop_captionW, CIM_STRING }, + { prop_osarchitectureW, CIM_STRING }, + { prop_oslanguageW, CIM_UINT32 }, + { prop_systemdirectoryW, CIM_STRING } }; static const struct column col_process[] = { @@ -178,6 +184,8 @@ struct record_operatingsystem { const WCHAR *caption; const WCHAR *osarchitecture; + UINT32 oslanguage; + const WCHAR *systemdirectory; }; struct record_process { @@ -321,7 +329,9 @@ done: static void fill_os( struct table *table ) { struct record_operatingsystem *rec; + WCHAR path[MAX_PATH]; SYSTEM_INFO info; + void *redir; if (!(table->data = heap_alloc( sizeof(*rec) ))) return; @@ -334,6 +344,13 @@ static void fill_os( struct table *table ) else rec->osarchitecture = os_32bitW; + rec->oslanguage = MAKELANGID( LANG_ENGLISH, SUBLANG_ENGLISH_US ); + + Wow64DisableWow64FsRedirection( &redir ); + GetSystemDirectoryW( path, MAX_PATH ); + Wow64RevertWow64FsRedirection( redir ); + rec->systemdirectory = heap_strdupW( path ); + TRACE("created 1 row\n"); table->num_rows = 1; }

1 0

Hans Leidekker : wbemprox Implement Win32_Processor. CpuStatus and Win32_Processor.DeviceId.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: 661d7f19c98b72af18c9487a87fd5a5f08a75dfc URL: http://source.winehq.org/git/wine.git/?a=commit;h=661d7f19c98b72af18c9487a8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 26 16:03:32 2012 +0200 wbemprox Implement Win32_Processor.CpuStatus and Win32_Processor.DeviceId. --- dlls/wbemprox/builtin.c | 32 +++++++++++++++++++++++++++----- 1 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 06ea824..eaffc80 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -59,6 +59,8 @@ static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; static const WCHAR prop_commandlineW[] = {'C','o','m','m','a','n','d','L','i','n','e',0}; +static const WCHAR prop_cpustatusW[] = + {'C','p','u','S','t','a','t','u','s',0}; static const WCHAR prop_descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR prop_deviceidW[] = @@ -134,6 +136,8 @@ static const struct column col_process[] = }; static const struct column col_processor[] = { + { prop_cpustatusW, CIM_UINT16 }, + { prop_deviceidW, CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { prop_manufacturerW, CIM_STRING } }; static const struct column col_videocontroller[] = @@ -208,6 +212,8 @@ struct record_process }; struct record_processor { + UINT16 cpu_status; + const WCHAR *device_id; const WCHAR *manufacturer; }; struct record_videocontroller @@ -221,10 +227,6 @@ static const struct record_bios data_bios[] = { { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW } }; -static const struct record_processor data_processor[] = -{ - { processor_manufacturerW } -}; static UINT get_processor_count(void) { @@ -356,6 +358,26 @@ done: CloseHandle( snap ); } +static void fill_processor( struct table *table ) +{ + static const WCHAR fmtW[] = {'C','P','U','%','u',0}; + WCHAR device_id[14]; + struct record_processor *rec; + UINT i, offset = 0, count = get_processor_count(); + + if (!(table->data = heap_alloc( sizeof(*rec) * count ))) return; + + for (i = 0; i < count; i++) + { + rec = (struct record_processor *)(table->data + offset); + rec->cpu_status = 1; /* CPU Enabled */ + rec->manufacturer = processor_manufacturerW; + sprintfW( device_id, fmtW, i ); + rec->device_id = heap_strdupW( device_id ); + offset += sizeof(*rec); + } +} + static void fill_os( struct table *table ) { struct record_operatingsystem *rec; @@ -425,7 +447,7 @@ static struct table classtable[] = { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, NULL, fill_networkadapter }, { class_osW, SIZEOF(col_os), col_os, 0, NULL, fill_os }, { class_processW, SIZEOF(col_process), col_process, 0, NULL, fill_process }, - { class_processorW, SIZEOF(col_processor), col_processor, SIZEOF(data_processor), (BYTE *)data_processor, NULL }, + { class_processorW, SIZEOF(col_processor), col_processor, 0, NULL, fill_processor }, { class_videocontrollerW, SIZEOF(col_videocontroller), col_videocontroller, 0, NULL, fill_videocontroller } };

1 0

Vincent Povirk : windowscodecs: Implement IWICPixelFormatInfo2:: SupportsTransparency.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: 12babdb7da25f22c8851303731a6fbbb5019a8ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=12babdb7da25f22c885130373… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 13 10:24:42 2012 -0500 windowscodecs: Implement IWICPixelFormatInfo2::SupportsTransparency. --- dlls/windowscodecs/info.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 980dfc4..b403310 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -50,6 +50,7 @@ static const WCHAR bitsperpixel_valuename[] = {'B','i','t','L','e','n','g','t',' static const WCHAR channelcount_valuename[] = {'C','h','a','n','n','e','l','C','o','u','n','t',0}; static const WCHAR channelmasks_keyname[] = {'C','h','a','n','n','e','l','M','a','s','k','s',0}; static const WCHAR numericrepresentation_valuename[] = {'N','u','m','e','r','i','c','R','e','p','r','e','s','e','n','t','a','t','i','o','n',0}; +static const WCHAR supportstransparency_valuename[] = {'S','u','p','p','o','r','t','s','T','r','a','n','s','p','a','r','e','n','c','y',0}; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -1324,8 +1325,11 @@ static HRESULT WINAPI PixelFormatInfo_GetChannelMask(IWICPixelFormatInfo2 *iface static HRESULT WINAPI PixelFormatInfo_SupportsTransparency(IWICPixelFormatInfo2 *iface, BOOL *pfSupportsTransparency) { - FIXME("(%p,%p): stub\n", iface, pfSupportsTransparency); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + + TRACE("(%p,%p)\n", iface, pfSupportsTransparency); + + return ComponentInfo_GetDWORDValue(This->classkey, supportstransparency_valuename, (DWORD*)pfSupportsTransparency); } static HRESULT WINAPI PixelFormatInfo_GetNumericRepresentation(IWICPixelFormatInfo2 *iface,

1 0

Vincent Povirk : windowscodecs: Implement IWICImagingFactory::CreateEncoder .
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: 02aa7ec403e5faf3d89126e39481a4c7209d5540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02aa7ec403e5faf3d89126e39… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 28 16:10:08 2012 -0600 windowscodecs: Implement IWICImagingFactory::CreateEncoder. --- dlls/windowscodecs/imgfactory.c | 60 +++++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index fa28c9a..d70c223 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -335,9 +335,65 @@ static HRESULT WINAPI ComponentFactory_CreateEncoder(IWICComponentFactory *iface REFGUID guidContainerFormat, const GUID *pguidVendor, IWICBitmapEncoder **ppIEncoder) { - FIXME("(%p,%s,%s,%p): stub\n", iface, debugstr_guid(guidContainerFormat), + static int fixme=0; + IEnumUnknown *enumencoders; + IUnknown *unkencoderinfo; + IWICBitmapEncoderInfo *encoderinfo; + IWICBitmapEncoder *encoder=NULL; + HRESULT res=S_OK; + ULONG num_fetched; + GUID actual_containerformat; + + TRACE("(%p,%s,%s,%p)\n", iface, debugstr_guid(guidContainerFormat), debugstr_guid(pguidVendor), ppIEncoder); - return E_NOTIMPL; + + if (pguidVendor && !fixme++) + FIXME("ignoring vendor GUID\n"); + + res = CreateComponentEnumerator(WICEncoder, WICComponentEnumerateDefault, &enumencoders); + if (FAILED(res)) return res; + + while (!encoder) + { + res = IEnumUnknown_Next(enumencoders, 1, &unkencoderinfo, &num_fetched); + + if (res == S_OK) + { + res = IUnknown_QueryInterface(unkencoderinfo, &IID_IWICBitmapEncoderInfo, (void**)&encoderinfo); + + if (SUCCEEDED(res)) + { + res = IWICBitmapEncoderInfo_GetContainerFormat(encoderinfo, &actual_containerformat); + + if (SUCCEEDED(res) && IsEqualGUID(guidContainerFormat, &actual_containerformat)) + { + res = IWICBitmapEncoderInfo_CreateInstance(encoderinfo, &encoder); + if (FAILED(res)) + encoder = NULL; + } + + IWICBitmapEncoderInfo_Release(encoderinfo); + } + + IUnknown_Release(unkencoderinfo); + } + else + break; + } + + IEnumUnknown_Release(enumencoders); + + if (encoder) + { + *ppIEncoder = encoder; + return S_OK; + } + else + { + WARN("failed to create encoder\n"); + *ppIEncoder = NULL; + return WINCODEC_ERR_COMPONENTNOTFOUND; + } } static HRESULT WINAPI ComponentFactory_CreatePalette(IWICComponentFactory *iface,

1 0

Vincent Povirk : windowscodecs: Add stub IWICBitmapScaler implementation.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: efab393295e3c9fe49891c778cd05b49f7426f4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=efab393295e3c9fe49891c778… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Feb 28 13:45:32 2012 -0600 windowscodecs: Add stub IWICBitmapScaler implementation. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/imgfactory.c | 5 +- dlls/windowscodecs/scaler.c | 169 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 174 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 28b5852..da851d5 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -24,6 +24,7 @@ C_SRCS = \ propertybag.c \ proxy.c \ regsvr.c \ + scaler.c \ stream.c \ tgaformat.c \ tiffformat.c \ diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 9ef8bbb..fa28c9a 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -356,8 +356,9 @@ static HRESULT WINAPI ComponentFactory_CreateFormatConverter(IWICComponentFactor static HRESULT WINAPI ComponentFactory_CreateBitmapScaler(IWICComponentFactory *iface, IWICBitmapScaler **ppIBitmapScaler) { - FIXME("(%p,%p): stub\n", iface, ppIBitmapScaler); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIBitmapScaler); + + return BitmapScaler_Create(ppIBitmapScaler); } static HRESULT WINAPI ComponentFactory_CreateBitmapClipper(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/scaler.c b/dlls/windowscodecs/scaler.c new file mode 100644 index 0000000..d3bd1b7 --- /dev/null +++ b/dlls/windowscodecs/scaler.c @@ -0,0 +1,169 @@ +/* + * Copyright 2010 Vincent Povirk 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 "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +typedef struct BitmapScaler { + IWICBitmapScaler IWICBitmapScaler_iface; + LONG ref; +} BitmapScaler; + +static inline BitmapScaler *impl_from_IWICBitmapScaler(IWICBitmapScaler *iface) +{ + return CONTAINING_RECORD(iface, BitmapScaler, IWICBitmapScaler_iface); +} + +static HRESULT WINAPI BitmapScaler_QueryInterface(IWICBitmapScaler *iface, REFIID iid, + void **ppv) +{ + BitmapScaler *This = impl_from_IWICBitmapScaler(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICBitmapSource, iid) || + IsEqualIID(&IID_IWICBitmapScaler, iid)) + { + *ppv = This; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI BitmapScaler_AddRef(IWICBitmapScaler *iface) +{ + BitmapScaler *This = impl_from_IWICBitmapScaler(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI BitmapScaler_Release(IWICBitmapScaler *iface) +{ + BitmapScaler *This = impl_from_IWICBitmapScaler(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI BitmapScaler_GetSize(IWICBitmapScaler *iface, + UINT *puiWidth, UINT *puiHeight) +{ + FIXME("(%p,%p,%p): stub\n", iface, puiWidth, puiHeight); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapScaler_GetPixelFormat(IWICBitmapScaler *iface, + WICPixelFormatGUID *pPixelFormat) +{ + FIXME("(%p,%p): stub\n", iface, pPixelFormat); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapScaler_GetResolution(IWICBitmapScaler *iface, + double *pDpiX, double *pDpiY) +{ + FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapScaler_CopyPalette(IWICBitmapScaler *iface, + IWICPalette *pIPalette) +{ + FIXME("(%p,%p): stub\n", iface, pIPalette); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapScaler_CopyPixels(IWICBitmapScaler *iface, + const WICRect *prc, UINT cbStride, UINT cbBufferSize, BYTE *pbBuffer) +{ + FIXME("(%p,%p,%u,%u,%p): stub\n", iface, prc, cbStride, cbBufferSize, pbBuffer); + + return E_NOTIMPL; +} + +static HRESULT WINAPI BitmapScaler_Initialize(IWICBitmapScaler *iface, + IWICBitmapSource *pISource, UINT uiWidth, UINT uiHeight, + WICBitmapInterpolationMode mode) +{ + FIXME("(%p,%p,%u,%u,%u): stub\n", iface, pISource, uiWidth, uiHeight, mode); + + return E_NOTIMPL; +} + +static const IWICBitmapScalerVtbl BitmapScaler_Vtbl = { + BitmapScaler_QueryInterface, + BitmapScaler_AddRef, + BitmapScaler_Release, + BitmapScaler_GetSize, + BitmapScaler_GetPixelFormat, + BitmapScaler_GetResolution, + BitmapScaler_CopyPalette, + BitmapScaler_CopyPixels, + BitmapScaler_Initialize +}; + +HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) +{ + BitmapScaler *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(BitmapScaler)); + if (!This) return E_OUTOFMEMORY; + + This->IWICBitmapScaler_iface.lpVtbl = &BitmapScaler_Vtbl; + This->ref = 1; + + *scaler = &This->IWICBitmapScaler_iface; + + return S_OK; +} diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 92fa7ef..815ee3d 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -44,6 +44,7 @@ extern HRESULT IcnsEncoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void* extern HRESULT TgaDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) DECLSPEC_HIDDEN; +extern HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) DECLSPEC_HIDDEN; extern HRESULT FlipRotator_Create(IWICBitmapFlipRotator **fliprotator) DECLSPEC_HIDDEN; extern HRESULT PaletteImpl_Create(IWICPalette **palette) DECLSPEC_HIDDEN; extern HRESULT StreamImpl_Create(IWICStream **stream) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Implement Win32_ComputerSystem. NumberOfLogicalProcessors and Win32_ComputerSystem.NumberOfProcessors.
by Alexandre Julliard June 26, 2012

June 26, 2012

Module: wine Branch: master Commit: 3ebf6c8bfa08618971eed89a034a25c2fd4edc3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ebf6c8bfa08618971eed89a0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 26 16:03:10 2012 +0200 wbemprox: Implement Win32_ComputerSystem.NumberOfLogicalProcessors and Win32_ComputerSystem.NumberOfProcessors. --- dlls/wbemprox/builtin.c | 50 +++++++++++++++++++++++++++++++++++++--------- 1 files changed, 40 insertions(+), 10 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index faaf5bb..06ea824 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -31,6 +31,7 @@ #include "tlhelp32.h" #include "initguid.h" #include "d3d10.h" +#include "winternl.h" #include "wine/debug.h" #include "wbemprox_private.h" @@ -41,6 +42,8 @@ static const WCHAR class_biosW[] = {'W','i','n','3','2','_','B','I','O','S',0}; static const WCHAR class_compsysW[] = {'W','i','n','3','2','_','C','o','m','p','u','t','e','r','S','y','s','t','e','m',0}; +static const WCHAR class_networkadapterW[] = + {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; static const WCHAR class_osW[] = {'W','i','n','3','2','_','O','p','e','r','a','t','i','n','g','S','y','s','t','e','m',0}; static const WCHAR class_processW[] = @@ -49,8 +52,6 @@ static const WCHAR class_processorW[] = {'W','i','n','3','2','_','P','r','o','c','e','s','s','o','r',0}; static const WCHAR class_videocontrollerW[] = {'W','i','n','3','2','_','V','i','d','e','o','C','o','n','t','r','o','l','l','e','r',0}; -static const WCHAR class_networkadapterW[] = - {'W','i','n','3','2','_','N','e','t','w','o','r','k','A','d','a','p','t','e','r',0}; static const WCHAR prop_adapterramW[] = {'A','d','a','p','t','e','r','R','A','M',0}; @@ -72,6 +73,10 @@ static const WCHAR prop_modelW[] = {'M','o','d','e','l',0}; static const WCHAR prop_netconnectionstatusW[] = {'N','e','t','C','o','n','n','e','c','t','i','o','n','S','t','a','t','u','s',0}; +static const WCHAR prop_numlogicalprocessorsW[] = + {'N','u','m','b','e','r','O','f','L','o','g','i','c','a','l','P','r','o','c','e','s','s','o','r','s',0}; +static const WCHAR prop_numprocessorsW[] = + {'N','u','m','b','e','r','O','f','P','r','o','c','e','s','s','o','r','s',0}; static const WCHAR prop_osarchitectureW[] = {'O','S','A','r','c','h','i','t','e','c','t','u','r','e',0}; static const WCHAR prop_oslanguageW[] = @@ -98,9 +103,11 @@ static const struct column col_bios[] = }; static const struct column col_compsys[] = { - { prop_descriptionW, CIM_STRING }, - { prop_manufacturerW, CIM_STRING }, - { prop_modelW, CIM_STRING } + { prop_descriptionW, CIM_STRING }, + { prop_manufacturerW, CIM_STRING }, + { prop_modelW, CIM_STRING }, + { prop_numlogicalprocessorsW, CIM_UINT32 }, + { prop_numprocessorsW, CIM_UINT32 } }; static const struct column col_networkadapter[] = { @@ -173,6 +180,8 @@ struct record_computersystem const WCHAR *description; const WCHAR *manufacturer; const WCHAR *model; + UINT32 num_logical_processors; + UINT32 num_processors; }; struct record_networkadapter { @@ -212,15 +221,36 @@ static const struct record_bios data_bios[] = { { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW } }; -static const struct record_computersystem data_compsys[] = -{ - { compsys_descriptionW, compsys_manufacturerW, compsys_modelW } -}; static const struct record_processor data_processor[] = { { processor_manufacturerW } }; +static UINT get_processor_count(void) +{ + SYSTEM_BASIC_INFORMATION info; + + if (NtQuerySystemInformation( SystemBasicInformation, &info, sizeof(info), NULL )) return 1; + return info.NumberOfProcessors; +} + +static void fill_compsys( struct table *table ) +{ + struct record_computersystem *rec; + + if (!(table->data = heap_alloc( sizeof(*rec) ))) return; + + rec = (struct record_computersystem *)table->data; + rec->description = compsys_descriptionW; + rec->manufacturer = compsys_manufacturerW; + rec->model = compsys_modelW; + rec->num_logical_processors = get_processor_count(); + rec->num_processors = rec->num_logical_processors; + + TRACE("created 1 row\n"); + table->num_rows = 1; +} + static UINT16 get_connection_status( IF_OPER_STATUS status ) { switch (status) @@ -391,7 +421,7 @@ done: static struct table classtable[] = { { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios, NULL }, - { class_compsysW, SIZEOF(col_compsys), col_compsys, SIZEOF(data_compsys), (BYTE *)data_compsys, NULL }, + { class_compsysW, SIZEOF(col_compsys), col_compsys, 0, NULL, fill_compsys }, { class_networkadapterW, SIZEOF(col_networkadapter), col_networkadapter, 0, NULL, fill_networkadapter }, { class_osW, SIZEOF(col_os), col_os, 0, NULL, fill_os }, { class_processW, SIZEOF(col_process), col_process, 0, NULL, fill_process },

1 0