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

Hans Leidekker : wbemprox: Add a partial Win32_Process class implementation .
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: c2a27a38725f06146573cad2df4696925feda2e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2a27a38725f06146573cad2d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 18 09:32:02 2012 +0200 wbemprox: Add a partial Win32_Process class implementation. --- dlls/wbemprox/builtin.c | 69 +++++++++++++++++++++++++++++++++++++- dlls/wbemprox/query.c | 68 +++++++++++++++++++++++++------------ dlls/wbemprox/wbemprox_private.h | 9 +++++ 3 files changed, 123 insertions(+), 23 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index c6879e7..2cf55d5 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" #include "wbemcli.h" +#include "tlhelp32.h" #include "wine/debug.h" #include "wbemprox_private.h" @@ -32,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); static const WCHAR class_biosW[] = {'W','i','n','3','2','_','B','I','O','S',0}; +static const WCHAR class_processW[] = + {'W','i','n','3','2','_','P','r','o','c','e','s','s',0}; static const WCHAR prop_captionW[] = {'C','a','p','t','i','o','n',0}; @@ -39,10 +42,16 @@ static const WCHAR prop_descriptionW[] = {'D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR prop_manufacturerW[] = {'M','a','n','u','f','a','c','t','u','r','e','r',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[] = + {'P','r','o','c','e','s','s','I','D',0}; 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_threadcountW[] = + {'T','h','r','e','a','d','C','o','u','n','t',0}; static const struct column col_bios[] = { @@ -51,6 +60,14 @@ static const struct column col_bios[] = { prop_releasedateW, CIM_DATETIME }, { prop_serialnumberW, CIM_STRING } }; +static const struct column col_process[] = +{ + { prop_captionW, CIM_STRING }, + { prop_descriptionW, CIM_STRING }, + { prop_pprocessidW, CIM_UINT32 }, + { prop_processidW, CIM_UINT32 }, + { prop_threadcountW, CIM_UINT32 } +}; static const WCHAR bios_descriptionW[] = {'D','e','f','a','u','l','t',' ','S','y','s','t','e','m',' ','B','I','O','S',0}; @@ -69,6 +86,14 @@ struct record_bios const WCHAR *releasedate; const WCHAR *serialnumber; }; +struct record_process +{ + const WCHAR *caption; + const WCHAR *description; + UINT32 pprocess_id; + UINT32 process_id; + UINT32 thread_count; +}; #include "poppack.h" static const struct record_bios data_bios[] = @@ -76,9 +101,50 @@ static const struct record_bios data_bios[] = { bios_descriptionW, bios_manufacturerW, bios_releasedateW, bios_serialnumberW } }; +static void fill_process( struct table *table ) +{ + struct record_process *rec; + PROCESSENTRY32W entry; + HANDLE snap; + UINT num_rows = 0, offset = 0, count = 8; + + snap = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 ); + if (snap == INVALID_HANDLE_VALUE) return; + + entry.dwSize = sizeof(entry); + if (!Process32FirstW( snap, &entry )) goto done; + if (!(table->data = heap_alloc( count * sizeof(*rec) ))) goto done; + + do + { + if (num_rows > count) + { + BYTE *data; + count *= 2; + if (!(data = heap_realloc( table->data, count * sizeof(*rec) ))) goto done; + table->data = data; + } + rec = (struct record_process *)(table->data + offset); + rec->caption = heap_strdupW( entry.szExeFile ); + rec->description = heap_strdupW( entry.szExeFile ); + rec->process_id = entry.th32ProcessID; + rec->pprocess_id = entry.th32ParentProcessID; + rec->thread_count = entry.cntThreads; + offset += sizeof(*rec); + num_rows++; + } while (Process32NextW( snap, &entry )); + + TRACE("created %u rows\n", num_rows); + table->num_rows = num_rows; + +done: + CloseHandle( snap ); +} + static struct table classtable[] = { - { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios } + { class_biosW, SIZEOF(col_bios), col_bios, SIZEOF(data_bios), (BYTE *)data_bios, NULL }, + { class_processW, SIZEOF(col_process), col_process, 0, NULL, fill_process } }; struct table *get_table( const WCHAR *name ) @@ -91,6 +157,7 @@ struct table *get_table( const WCHAR *name ) if (!strcmpiW( classtable[i].name, name )) { table = &classtable[i]; + if (table->fill && !table->data) table->fill( table ); break; } } diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 7b228ae..1d17a28 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -30,28 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); -HRESULT create_view( const struct property *proplist, const WCHAR *class, - const struct expr *cond, struct view **ret ) -{ - struct view *view = heap_alloc( sizeof(struct view) ); - - if (!view) return E_OUTOFMEMORY; - view->proplist = proplist; - view->table = get_table( class ); - view->cond = cond; - view->result = NULL; - view->count = 0; - view->index = 0; - *ret = view; - return S_OK; -} - -void destroy_view( struct view *view ) -{ - heap_free( view->result ); - heap_free( view ); -} - static HRESULT get_column_index( const struct table *table, const WCHAR *name, UINT *column ) { UINT i; @@ -140,6 +118,52 @@ static HRESULT get_value( const struct table *table, UINT row, UINT column, INT_ return S_OK; } +HRESULT create_view( const struct property *proplist, const WCHAR *class, + const struct expr *cond, struct view **ret ) +{ + struct view *view = heap_alloc( sizeof(struct view) ); + + if (!view) return E_OUTOFMEMORY; + view->proplist = proplist; + view->table = get_table( class ); + view->cond = cond; + view->result = NULL; + view->count = 0; + view->index = 0; + *ret = view; + return S_OK; +} + +static void clear_table( struct table *table ) +{ + UINT i, j; + + if (!table->fill || !table->data) return; + + for (i = 0; i < table->num_rows; i++) + { + for (j = 0; j < table->num_cols; j++) + { + if (table->columns[j].type == CIM_STRING || + table->columns[j].type == CIM_DATETIME || + (table->columns[j].type & CIM_FLAG_ARRAY)) + { + void *ptr; + if (get_value( table, i, j, (INT_PTR *)&ptr ) == S_OK) heap_free( ptr ); + } + } + } + heap_free( table->data ); + table->data = NULL; +} + +void destroy_view( struct view *view ) +{ + if (view->table) clear_table( view->table ); + heap_free( view->result ); + heap_free( view ); +} + static BOOL eval_like( INT_PTR lval, INT_PTR rval ) { const WCHAR *p = (const WCHAR *)lval, *q = (const WCHAR *)rval; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 1e3ca0c..15a7146 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -34,6 +34,7 @@ struct table const struct column *columns; UINT num_rows; BYTE *data; + void (*fill)(struct table *); }; struct property @@ -135,3 +136,11 @@ static inline BOOL heap_free( void *mem ) { return HeapFree( GetProcessHeap(), 0, mem ); } + +static inline WCHAR *heap_strdupW( const WCHAR *src ) +{ + WCHAR *dst; + if (!src) return NULL; + if ((dst = heap_alloc( (strlenW( src ) + 1) * sizeof(WCHAR) ))) strcpyW( dst, src ); + return dst; +}

1 0

Hans Leidekker : wbemprox: Implement IEnumWbemClassObject::Skip.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: bb80d7db9a6ded62441baf069b316e939a3cb4af URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb80d7db9a6ded62441baf069… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 18 09:31:00 2012 +0200 wbemprox: Implement IEnumWbemClassObject::Skip. --- dlls/wbemprox/class.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index 9119132..b31dcbb 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -152,8 +152,20 @@ static HRESULT WINAPI enum_class_object_Skip( LONG lTimeout, ULONG nCount ) { - FIXME("%p, %d, %u\n", iface, lTimeout, nCount); - return E_NOTIMPL; + struct enum_class_object *ec = impl_from_IEnumWbemClassObject( iface ); + struct view *view = ec->query->view; + + TRACE("%p, %d, %u\n", iface, lTimeout, nCount); + + if (lTimeout != WBEM_INFINITE) FIXME("timeout not supported\n"); + + if (view->index + nCount >= view->count) + { + view->index = view->count - 1; + return WBEM_S_FALSE; + } + view->index += nCount; + return WBEM_S_NO_ERROR; } static const IEnumWbemClassObjectVtbl enum_class_object_vtbl =

1 0

Henri Verbeet : wined3d: Reset render target bindings in wined3d_device_reset().
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: befdbbd90f3be5e044d11be8af049410e7628f00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=befdbbd90f3be5e044d11be8a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 18 17:19:39 2012 +0200 wined3d: Reset render target bindings in wined3d_device_reset(). --- dlls/wined3d/device.c | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c934ced..b4ff8c8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5249,11 +5249,26 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_display_mode mode; BOOL DisplayModeChanged = FALSE; BOOL update_desc = FALSE; + unsigned int i; HRESULT hr; TRACE("device %p, swapchain_desc %p.\n", device, swapchain_desc); + if (FAILED(hr = wined3d_device_get_swapchain(device, 0, &swapchain))) + { + ERR("Failed to get the first implicit swapchain.\n"); + return hr; + } + stateblock_unbind_resources(device->stateBlock); + if (swapchain->back_buffers && swapchain->back_buffers[0]) + wined3d_device_set_render_target(device, 0, swapchain->back_buffers[0], FALSE); + else + wined3d_device_set_render_target(device, 0, swapchain->front_buffer, FALSE); + for (i = 1; i < device->adapter->gl_info.limits.buffers; ++i) + { + wined3d_device_set_render_target(device, i, NULL, FALSE); + } wined3d_device_set_depth_stencil(device, NULL); if (device->onscreen_depth_stencil) @@ -5266,14 +5281,10 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, { TRACE("Enumerating resource %p.\n", resource); if (FAILED(hr = callback(resource))) + { + wined3d_swapchain_decref(swapchain); return hr; - } - - hr = wined3d_device_get_swapchain(device, 0, &swapchain); - if (FAILED(hr)) - { - ERR("Failed to get the first implicit swapchain\n"); - return hr; + } } if (!is_display_mode_supported(device, swapchain_desc))

1 0

Henri Verbeet : d3d9/tests: Add a test for resource bindings after reset.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: d74a587b1bced369c5dea08bbb97467ceba614dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d74a587b1bced369c5dea08bb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 18 17:19:40 2012 +0200 d3d9/tests: Add a test for resource bindings after reset. --- dlls/d3d9/tests/device.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 607eced..7994a2a 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -3425,6 +3425,85 @@ done: UnregisterClassA("d3d9_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_reset_resources(void) +{ + IDirect3DSurface9 *surface, *rt; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; + IDirect3D9 *d3d9; + unsigned int i; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + ULONG ref; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + DestroyWindow(window); + return; + } + + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_DEPTHSTENCIL, + D3DFMT_D24S8, D3DPOOL_DEFAULT, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create depth/stencil texture, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); + IDirect3DTexture9_Release(texture); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, surface); + ok(SUCCEEDED(hr), "Failed to set depth/stencil surface, hr %#x.\n", hr); + IDirect3DSurface9_Release(surface); + + for (i = 0; i < caps.NumSimultaneousRTs; ++i) + { + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, + D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create render target texture %u, hr %#x.\n", i, hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get surface %u, hr %#x.\n", i, hr); + IDirect3DTexture9_Release(texture); + hr = IDirect3DDevice9_SetRenderTarget(device, i, surface); + ok(SUCCEEDED(hr), "Failed to set render target surface %u, hr %#x.\n", i, hr); + IDirect3DSurface9_Release(surface); + } + + hr = reset_device(device, device_window, TRUE); + ok(SUCCEEDED(hr), "Failed to reset device.\n"); + + hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &rt); + ok(SUCCEEDED(hr), "Failed to get back buffer, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &surface); + ok(SUCCEEDED(hr), "Failed to get render target surface, hr %#x.\n", hr); + ok(surface == rt, "Got unexpected surface %p for render target.\n", surface); + IDirect3DSurface9_Release(surface); + IDirect3DSurface9_Release(rt); + + for (i = 1; i < caps.NumSimultaneousRTs; ++i) + { + hr = IDirect3DDevice9_GetRenderTarget(device, i, &surface); + ok(hr == D3DERR_NOTFOUND, "Got unexpected hr %#x.\n", hr); + } + + ref = IDirect3DDevice9_Release(device); + ok(ref == 0, "The device was not properly freed: refcount %u.\n", ref); + +done: + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -3481,6 +3560,7 @@ START_TEST(device) test_window_style(); test_mode_change(); test_device_window_reset(); + test_reset_resources(); } out:

1 0

Hans Leidekker : wbemprox: Implement IWbemClassObject::Get.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: 92e99866282925e07cda24de3e28a7aa4f17cf74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e99866282925e07cda24de3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 18 09:31:29 2012 +0200 wbemprox: Implement IWbemClassObject::Get. --- dlls/wbemprox/Makefile.in | 2 +- dlls/wbemprox/class.c | 14 ++++++++++- dlls/wbemprox/query.c | 42 ++++++++++++++++++++++++++++++++++++++ dlls/wbemprox/wbemprox_private.h | 2 + 4 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/Makefile.in b/dlls/wbemprox/Makefile.in index 3a4d9f3..f973c2f 100644 --- a/dlls/wbemprox/Makefile.in +++ b/dlls/wbemprox/Makefile.in @@ -1,5 +1,5 @@ MODULE = wbemprox.dll -IMPORTS = ole32 advapi32 +IMPORTS = oleaut32 ole32 advapi32 C_SRCS = \ builtin.c \ diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index b31dcbb..a1fbb70 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -274,8 +274,18 @@ static HRESULT WINAPI class_object_Get( CIMTYPE *pType, LONG *plFlavor ) { - FIXME("%p, %s, %08x, %p, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, pType, plFlavor); - return E_NOTIMPL; + struct class_object *co = impl_from_IWbemClassObject( iface ); + struct enum_class_object *ec = impl_from_IEnumWbemClassObject( co->iter ); + struct view *view = ec->query->view; + + TRACE("%p, %s, %08x, %p, %p, %p\n", iface, debugstr_w(wszName), lFlags, pVal, pType, plFlavor); + + if (plFlavor) + { + FIXME("flavor parameter not supported\n"); + *plFlavor = 0; + } + return get_propval( view, co->index, wszName, pVal, pType ); } static HRESULT WINAPI class_object_Put( diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 701d656..7b228ae 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -347,3 +347,45 @@ done: if (hr != S_OK) free_query( query ); return hr; } + +static BOOL is_selected_prop( const struct view *view, const WCHAR *name ) +{ + const struct property *prop = view->proplist; + + if (!prop) return TRUE; + while (prop) + { + if (!strcmpiW( prop->name, name )) return TRUE; + prop = prop->next; + } + return FALSE; +} + +HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VARIANT *ret, CIMTYPE *type ) +{ + HRESULT hr; + UINT column, row = view->result[index]; + INT_PTR val; + + if (!is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; + + hr = get_column_index( view->table, name, &column ); + if (hr != S_OK) return WBEM_E_NOT_FOUND; + + hr = get_value( view->table, row, column, &val ); + if (hr != S_OK) return hr; + + switch (view->table->columns[column].type) + { + case CIM_STRING: + case CIM_DATETIME: + V_VT( ret ) = VT_BSTR; + V_BSTR( ret ) = SysAllocString( (const WCHAR *)val ); + break; + default: + ERR("unhandled column type %u\n", view->table->columns[column].type); + return WBEM_E_FAILED; + } + if (type) *type = view->table->columns[column].type; + return S_OK; +} diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 3b4af0d..1e3ca0c 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -111,6 +111,8 @@ HRESULT create_view( const struct property *, const WCHAR *, const struct expr * struct view ** ) DECLSPEC_HIDDEN; void destroy_view( struct view * ) DECLSPEC_HIDDEN; struct table *get_table( const WCHAR * ) DECLSPEC_HIDDEN; +HRESULT get_propval( const struct view *, UINT, const WCHAR *, VARIANT *, + CIMTYPE * ) DECLSPEC_HIDDEN; HRESULT WbemLocator_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN; HRESULT WbemServices_create(IUnknown *, LPVOID *) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : wbemprox: Implement IEnumWbemClassObject::Reset.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: 0f936f49ca199b9ba6b834e69bfdf6e470f4e05d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f936f49ca199b9ba6b834e69… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jun 18 09:30:43 2012 +0200 wbemprox: Implement IEnumWbemClassObject::Reset. --- dlls/wbemprox/class.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index a950e41..9119132 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -91,8 +91,13 @@ static HRESULT WINAPI enum_class_object_QueryInterface( static HRESULT WINAPI enum_class_object_Reset( IEnumWbemClassObject *iface ) { - FIXME("%p\n", iface); - return E_NOTIMPL; + struct enum_class_object *ec = impl_from_IEnumWbemClassObject( iface ); + struct view *view = ec->query->view; + + TRACE("%p\n", iface); + + view->index = 0; + return WBEM_S_NO_ERROR; } static HRESULT WINAPI enum_class_object_Next(

1 0

Thomas Faber : port.h: Add INFINITY macro.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: cb8af0152c97082503d38de2a498727df2feed77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb8af0152c97082503d38de2a… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Jun 17 15:59:25 2012 +0200 port.h: Add INFINITY macro. --- include/wine/port.h | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 4b653c7..9030aab 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -199,6 +199,15 @@ struct statvfs #define M_PI_2 1.570796326794896619 #endif +#ifndef INFINITY +static inline float __port_infinity(void) +{ + static const unsigned __inf_bytes = 0x7f800000; + return *(const float *)&__inf_bytes; +} +#define INFINITY __port_infinity() +#endif + #ifndef NAN static inline float __port_nan(void) {

1 0

Thomas Faber : wined3d: Use INFINITY.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: a6510b3fbcfd35644f39ee02637392805f0b60dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6510b3fbcfd35644f39ee026… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Jun 17 16:07:30 2012 +0200 wined3d: Use INFINITY. --- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 35e1736..b3d5fa3 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1049,7 +1049,7 @@ void state_fogstartend(struct wined3d_context *context, const struct wined3d_sta fogend = tmpvalue.f; /* In GL, fogstart == fogend disables fog, in D3D everything's fogged.*/ if(fogstart == fogend) { - fogstart = -1.0f / 0.0f; + fogstart = -INFINITY; fogend = 0.0f; } break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4b5176d..9aa4be3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -199,7 +199,7 @@ static inline float float_16_to_32(const unsigned short *in) { } else if(e < 31) { return sgn * powf(2, (float)e - 15.0f) * (1.0f + ((float)m / 1024.0f)); } else { - if(m == 0) return sgn / 0.0f; /* +INF / -INF */ + if(m == 0) return sgn * INFINITY; else return NAN; } } @@ -221,7 +221,7 @@ static inline float float_24_to_32(DWORD in) } else { - if (m == 0) return sgn / 0.0f; /* +INF / -INF */ + if (m == 0) return sgn * INFINITY; else return NAN; } }

1 0

Thomas Faber : include: Make IMAGE_COR20_HEADER declaration compatible with PSDK headers.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: bb95b706cb5b7022fb56f48222b1034dd133b4b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb95b706cb5b7022fb56f4822… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sun Jun 17 15:51:56 2012 +0200 include: Make IMAGE_COR20_HEADER declaration compatible with PSDK headers. --- dlls/fusion/tests/asmcache.c | 2 +- include/winnt.h | 5 ++++- tools/winedump/pe.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/fusion/tests/asmcache.c b/dlls/fusion/tests/asmcache.c index 890bd9c..e97cfbe 100644 --- a/dlls/fusion/tests/asmcache.c +++ b/dlls/fusion/tests/asmcache.c @@ -412,7 +412,7 @@ static struct _tagASSEMBLY 5, /* MinorRuntimeVersion */ { 0x2188, 0x1B4 }, /* MetaData */ COMIMAGE_FLAGS_ILONLY | COMIMAGE_FLAGS_STRONGNAMESIGNED, /* Flags */ - 0, /* EntryPointToken */ + { 0 }, /* EntryPointToken */ { 0x20D0, 0xB8 }, /* Resources */ { 0x2050, 0x80 }, /* StrongNameSignature */ { 0 }, /* CodeManagerTable */ diff --git a/include/winnt.h b/include/winnt.h index 6903d34..16cc4e9 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3429,7 +3429,10 @@ typedef struct IMAGE_COR20_HEADER IMAGE_DATA_DIRECTORY MetaData; DWORD Flags; - DWORD EntryPointToken; + union { + DWORD EntryPointToken; + DWORD EntryPointRVA; + } DUMMYUNIONNAME; IMAGE_DATA_DIRECTORY Resources; IMAGE_DATA_DIRECTORY StrongNameSignature; diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index f005b49..c655451 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -966,7 +966,7 @@ static void dump_dir_clr_header(void) print_dword( "Header Size", dir->cb ); print_ver( "Required runtime version", dir->MajorRuntimeVersion, dir->MinorRuntimeVersion ); print_clrflags( "Flags", dir->Flags ); - print_dword( "EntryPointToken", dir->EntryPointToken ); + print_dword( "EntryPointToken", dir->u.EntryPointToken ); printf("\n"); printf( "CLR Data Directory\n" ); print_clrdirectory( "MetaData", &dir->MetaData );

1 0

Nikolay Sivov : msxml3: Reader shouldn' t depend on input being properly allocated BSTR string.
by Alexandre Julliard June 18, 2012

June 18, 2012

Module: wine Branch: master Commit: 7cbd9dcdc31e7d2febcb562f96ae2aa6d8960bf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cbd9dcdc31e7d2febcb562f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 17 23:51:09 2012 +0400 msxml3: Reader shouldn't depend on input being properly allocated BSTR string. --- dlls/msxml3/saxreader.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index cf87d98..485644a 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2151,6 +2151,8 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz saxlocator *locator; HRESULT hr; + TRACE("(%p)->(%p %d)\n", This, buffer, size); + hr = SAXLocator_create(This, &locator, vbInterface); if (FAILED(hr)) return hr; @@ -2441,7 +2443,7 @@ static HRESULT internal_parse( { case VT_BSTR: hr = internal_parseBuffer(This, (const char*)V_BSTR(&varInput), - SysStringByteLen(V_BSTR(&varInput)), vbInterface); + strlenW(V_BSTR(&varInput))*sizeof(WCHAR), vbInterface); break; case VT_ARRAY|VT_UI1: { void *pSAData;

1 0