October 2009 - Wine-Commits

Henri Verbeet : wined3d: Add a separate structure for driver info.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 5fbe5ee02782ef73302c1e3610b3bdd52b038ae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fbe5ee02782ef73302c1e361… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 26 10:12:16 2009 +0100 wined3d: Add a separate structure for driver info. --- dlls/wined3d/directx.c | 86 ++++++++++++++++++++------------------- dlls/wined3d/wined3d_gl.h | 3 - dlls/wined3d/wined3d_private.h | 11 ++++- 3 files changed, 53 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 6984a57..06240e5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -991,6 +991,34 @@ static const struct driver_version_information driver_version_table[] = /* TODO: Add information about legacy ATI hardware, Intel and other cards. */ }; +static void init_driver_info(struct wined3d_driver_info *driver_info, WORD vendor, WORD device) +{ + unsigned int i; + + driver_info->name = "Display"; + driver_info->description = "Direct3D HAL"; + driver_info->version_high = MAKEDWORD_VERSION(7, 1); + driver_info->version_low = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */ + + for (i = 0; i < (sizeof(driver_version_table) / sizeof(driver_version_table[0])); ++i) + { + if (vendor == driver_version_table[i].vendor && device == driver_version_table[i].card) + { + TRACE_(d3d_caps)("Found card %04x:%04x in driver DB.\n", vendor, device); + + driver_info->description = driver_version_table[i].description; + driver_info->version_high = MAKEDWORD_VERSION(driver_version_table[i].hipart_hi, + driver_version_table[i].hipart_lo); + driver_info->version_low = MAKEDWORD_VERSION(driver_version_table[i].lopart_hi, + driver_version_table[i].lopart_lo); + break; + } + } + + TRACE_(d3d_caps)("Reporting (fake) driver version 0x%08x-0x%08x.\n", + driver_info->version_high, driver_info->version_low); +} + /* Context activation is done by the caller. */ static void fixup_extensions(struct wined3d_gl_info *gl_info, const char *gl_renderer) { @@ -1005,28 +1033,6 @@ static void fixup_extensions(struct wined3d_gl_info *gl_info, const char *gl_ren /* Find out if PBOs work as they are supposed to. */ test_pbo_functionality(gl_info); - - /* Fixup the driver version we'll report to the app. */ - gl_info->driver_version = MAKEDWORD_VERSION(8, 6); /* Nvidia RIVA TNT, arbitrary */ - gl_info->driver_version_hipart = MAKEDWORD_VERSION(7, 1); - for (i = 0; i < (sizeof(driver_version_table) / sizeof(driver_version_table[0])); ++i) - { - if (gl_info->gl_vendor == driver_version_table[i].vendor - && gl_info->gl_card == driver_version_table[i].card) - { - TRACE_(d3d_caps)("Found card 0x%04x, 0x%04x in driver version DB.\n", - gl_info->gl_vendor, gl_info->gl_card); - - gl_info->driver_version = MAKEDWORD_VERSION(driver_version_table[i].lopart_hi, - driver_version_table[i].lopart_lo); - gl_info->driver_version_hipart = MAKEDWORD_VERSION(driver_version_table[i].hipart_hi, - driver_version_table[i].hipart_lo); - gl_info->driver_description = driver_version_table[i].description; - break; - } - } - TRACE_(d3d_caps)("Reporting (fake) driver version 0x%08X-0x%08X.\n", - gl_info->driver_version_hipart, gl_info->driver_version); } static DWORD wined3d_parse_gl_version(const char *gl_version) @@ -1534,7 +1540,7 @@ static GL_Cards wined3d_guess_card(const struct wined3d_gl_info *gl_info, const } /* Context activation is done by the caller. */ -static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) +static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_driver_info *driver_info, struct wined3d_gl_info *gl_info) { const char *GL_Extensions = NULL; const char *WGL_Extensions = NULL; @@ -2075,6 +2081,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_gl_info *gl_info) } fixup_extensions(gl_info, gl_renderer); + init_driver_info(driver_info, gl_info->gl_vendor, gl_info->gl_card); add_gl_compat_wrappers(gl_info); HeapFree(GetProcessHeap(), 0, gl_renderer); @@ -2296,6 +2303,7 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterDisplayMode(IWineD3D *iface, UINT A static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Adapter, DWORD Flags, WINED3DADAPTER_IDENTIFIER* pIdentifier) { IWineD3DImpl *This = (IWineD3DImpl *)iface; + struct wined3d_adapter *adapter; size_t len; TRACE_(d3d_caps)("(%p}->(Adapter: %d, Flags: %x, pId=%p)\n", This, Adapter, Flags, pIdentifier); @@ -2304,25 +2312,22 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad return WINED3DERR_INVALIDCALL; } + adapter = &This->adapters[Adapter]; + /* Return the information requested */ TRACE_(d3d_caps)("device/Vendor Name and Version detection using FillGLCaps\n"); if (pIdentifier->driver_size) { - len = min(strlen(This->adapters[Adapter].driver), pIdentifier->driver_size - 1); - memcpy(pIdentifier->driver, This->adapters[Adapter].driver, len); + const char *name = adapter->driver_info.name; + len = min(strlen(name), pIdentifier->driver_size - 1); + memcpy(pIdentifier->driver, name, len); pIdentifier->driver[len] = '\0'; } if (pIdentifier->description_size) { - const char *description; - - if (This->adapters[Adapter].gl_info.driver_description) - description = This->adapters[Adapter].gl_info.driver_description; - else - description = This->adapters[Adapter].description; - + const char *description = adapter->driver_info.description; len = min(strlen(description), pIdentifier->description_size - 1); memcpy(pIdentifier->description, description, len); pIdentifier->description[len] = '\0'; @@ -2344,10 +2349,10 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad pIdentifier->device_name[len] = '\0'; } - pIdentifier->driver_version.u.HighPart = This->adapters[Adapter].gl_info.driver_version_hipart; - pIdentifier->driver_version.u.LowPart = This->adapters[Adapter].gl_info.driver_version; - pIdentifier->vendor_id = This->adapters[Adapter].gl_info.gl_vendor; - pIdentifier->device_id = This->adapters[Adapter].gl_info.gl_card; + pIdentifier->driver_version.u.HighPart = adapter->driver_info.version_high; + pIdentifier->driver_version.u.LowPart = adapter->driver_info.version_low; + pIdentifier->vendor_id = adapter->gl_info.gl_vendor; + pIdentifier->device_id = adapter->gl_info.gl_card; pIdentifier->subsystem_id = 0; pIdentifier->revision = 0; memcpy(&pIdentifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(pIdentifier->device_identifier)); @@ -4702,7 +4707,7 @@ BOOL InitAdapters(IWineD3DImpl *This) goto nogl_adapter; } - ret = IWineD3DImpl_FillGLCaps(&adapter->gl_info); + ret = IWineD3DImpl_FillGLCaps(&adapter->driver_info, &adapter->gl_info); if(!ret) { ERR("Failed to initialize gl caps for default adapter\n"); WineD3D_ReleaseFakeGLContext(&fake_gl_ctx); @@ -4717,9 +4722,6 @@ BOOL InitAdapters(IWineD3DImpl *This) hdc = fake_gl_ctx.dc; - adapter->driver = "Display"; - adapter->description = "Direct3D HAL"; - /* Use the VideoRamSize registry setting when set */ if(wined3d_settings.emulated_textureram) adapter->TextureRam = wined3d_settings.emulated_textureram; @@ -4897,8 +4899,8 @@ nogl_adapter: This->adapters[0].monitorPoint.x = -1; This->adapters[0].monitorPoint.y = -1; - This->adapters[0].driver = "Display"; - This->adapters[0].description = "WineD3D DirectDraw Emulation"; + This->adapters[0].driver_info.name = "Display"; + This->adapters[0].driver_info.description = "WineD3D DirectDraw Emulation"; if(wined3d_settings.emulated_textureram) { This->adapters[0].TextureRam = wined3d_settings.emulated_textureram; } else { diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index e77be8b..446a7a0 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -4141,9 +4141,6 @@ struct wined3d_gl_info GL_Vendors gl_vendor; GL_Cards gl_card; UINT vidmem; - DWORD driver_version; - DWORD driver_version_hipart; - const char *driver_description; UINT max_buffers; UINT max_lights; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cc097fb..98fea80 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1228,6 +1228,14 @@ typedef struct WineD3D_PixelFormat int numSamples; } WineD3D_PixelFormat; +struct wined3d_driver_info +{ + const char *name; + const char *description; + DWORD version_high; + DWORD version_low; +}; + /* The adapter structure */ struct wined3d_adapter { @@ -1235,8 +1243,7 @@ struct wined3d_adapter BOOL opengl; POINT monitorPoint; struct wined3d_gl_info gl_info; - const char *driver; - const char *description; + struct wined3d_driver_info driver_info; WCHAR DeviceName[CCHDEVICENAME]; /* DeviceName for use with e.g. ChangeDisplaySettings */ int nCfgs; WineD3D_PixelFormat *cfgs;

1 0

Hans Leidekker : winhttp: Implement HTTP_OPTION_PARENT_HANDLE for connection handles.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 253d2c17d6264050c965f550b7103d174a5097d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=253d2c17d6264050c965f550b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 26 09:56:33 2009 +0100 winhttp: Implement HTTP_OPTION_PARENT_HANDLE for connection handles. --- dlls/winhttp/session.c | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 448603f..9992e5b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -229,10 +229,36 @@ static void connect_destroy( object_header_t *hdr ) heap_free( connect ); } +static BOOL connect_query_option( object_header_t *hdr, DWORD option, LPVOID buffer, LPDWORD buflen ) +{ + connect_t *connect = (connect_t *)hdr; + + switch (option) + { + case WINHTTP_OPTION_PARENT_HANDLE: + { + if (!buffer || *buflen < sizeof(HINTERNET)) + { + *buflen = sizeof(HINTERNET); + set_last_error( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + + *(HINTERNET *)buffer = ((object_header_t *)connect->session)->handle; + *buflen = sizeof(HINTERNET); + return TRUE; + } + default: + FIXME("unimplemented option %u\n", option); + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } +} + static const object_vtbl_t connect_vtbl = { connect_destroy, - NULL, + connect_query_option, NULL };

1 0

Henri Verbeet : wined3d: Fix a typo.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: d03a105c1acfe92cc56e5075edc6a0ff2fee6ae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03a105c1acfe92cc56e5075e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 26 10:12:18 2009 +0100 wined3d: Fix a typo. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 83f537c..d7c251a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1357,7 +1357,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclaration(IWineD3DDevice return hr; } - TRACE("Created verrtex declaration %p.\n", object); + TRACE("Created vertex declaration %p.\n", object); *declaration = (IWineD3DVertexDeclaration *)object; return WINED3D_OK;

1 0

Kirill K. Smirnov : gdiplus: Avoid deleting non-existent object.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 125c5645cbcb5909856e6236c5674089f8e06037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=125c5645cbcb5909856e6236c… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sun Oct 25 17:05:47 2009 +0300 gdiplus: Avoid deleting non-existent object. --- dlls/gdiplus/image.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9813e52..5b70918 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -932,11 +932,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) TRACE("%p, %p\n", hicon, bitmap); if(!bitmap || !GetIconInfo(hicon, &iinfo)) - { - DeleteObject(iinfo.hbmColor); - DeleteObject(iinfo.hbmMask); return InvalidParameter; - } /* get the size of the icon */ ret = GetObjectA(iinfo.hbmColor ? iinfo.hbmColor : iinfo.hbmMask, sizeof(bm), &bm);

1 0

Vincent Povirk : ole32: Don' t use IEnumSTATSTG to search for elements of storages.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: ee6856d874d687c4504914e61bcde3e6b8823bca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee6856d874d687c4504914e61… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Fri Oct 23 13:57:42 2009 -0500 ole32: Don't use IEnumSTATSTG to search for elements of storages. We use it to do a linear search of a binary tree, which is overkill. Replace it with a simple binary search. --- dlls/ole32/storage32.c | 181 ++++++++++++++++++------------------------------ 1 files changed, 68 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ee6856d874d687c450491…

1 0

Vincent Povirk : ole32: Clarify the timestamp fields in StgProperty.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 224ddb50f325d558d3e4a2f419484f1f30ba1b5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=224ddb50f325d558d3e4a2f41… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Fri Oct 23 13:29:56 2009 -0500 ole32: Clarify the timestamp fields in StgProperty. According to the MS spec, these are FILETIME structures containing creation and modification times. --- dlls/ole32/storage32.c | 50 +++++++++++++++++++++-------------------------- dlls/ole32/storage32.h | 14 +++++------- 2 files changed, 28 insertions(+), 36 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b9c2f29..32ff8b6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -773,10 +773,8 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( renamedProperty.dirProperty = currentProperty.dirProperty; /* call CoFileTime to get the current time - renamedProperty.timeStampS1 - renamedProperty.timeStampD1 - renamedProperty.timeStampS2 - renamedProperty.timeStampD2 + renamedProperty.ctime + renamedProperty.mtime renamedProperty.propertyUniqueID */ @@ -967,10 +965,8 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( newStreamProperty.dirProperty = PROPERTY_NULL; /* call CoFileTime to get the current time - newStreamProperty.timeStampS1 - newStreamProperty.timeStampD1 - newStreamProperty.timeStampS2 - newStreamProperty.timeStampD2 + newStreamProperty.ctime + newStreamProperty.mtime */ /* newStreamProperty.propertyUniqueID */ @@ -1167,10 +1163,8 @@ static HRESULT WINAPI StorageImpl_CreateStorage( newProperty.dirProperty = PROPERTY_NULL; /* call CoFileTime to get the current time - newProperty.timeStampS1 - newProperty.timeStampD1 - newProperty.timeStampS2 - newProperty.timeStampD2 + newProperty.ctime + newProperty.mtime */ /* newStorageProperty.propertyUniqueID */ @@ -3234,23 +3228,23 @@ BOOL StorageImpl_ReadProperty( StorageUtl_ReadDWord( currentProperty, - OFFSET_PS_TSS1, - &buffer->timeStampS1); + OFFSET_PS_CTIMELOW, + &buffer->ctime.dwLowDateTime); StorageUtl_ReadDWord( currentProperty, - OFFSET_PS_TSD1, - &buffer->timeStampD1); + OFFSET_PS_CTIMEHIGH, + &buffer->ctime.dwHighDateTime); StorageUtl_ReadDWord( currentProperty, - OFFSET_PS_TSS2, - &buffer->timeStampS2); + OFFSET_PS_MTIMELOW, + &buffer->mtime.dwLowDateTime); StorageUtl_ReadDWord( currentProperty, - OFFSET_PS_TSD2, - &buffer->timeStampD2); + OFFSET_PS_MTIMEHIGH, + &buffer->mtime.dwHighDateTime); StorageUtl_ReadDWord( currentProperty, @@ -3320,23 +3314,23 @@ BOOL StorageImpl_WriteProperty( StorageUtl_WriteDWord( currentProperty, - OFFSET_PS_TSS1, - buffer->timeStampS1); + OFFSET_PS_CTIMELOW, + buffer->ctime.dwLowDateTime); StorageUtl_WriteDWord( currentProperty, - OFFSET_PS_TSD1, - buffer->timeStampD1); + OFFSET_PS_CTIMEHIGH, + buffer->ctime.dwHighDateTime); StorageUtl_WriteDWord( currentProperty, - OFFSET_PS_TSS2, - buffer->timeStampS2); + OFFSET_PS_MTIMELOW, + buffer->mtime.dwLowDateTime); StorageUtl_WriteDWord( currentProperty, - OFFSET_PS_TSD2, - buffer->timeStampD2); + OFFSET_PS_MTIMEHIGH, + buffer->ctime.dwHighDateTime); StorageUtl_WriteDWord( currentProperty, diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index fc4af32..a1b7ac5 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -58,10 +58,10 @@ static const ULONG OFFSET_PS_PREVIOUSPROP = 0x00000044; static const ULONG OFFSET_PS_NEXTPROP = 0x00000048; static const ULONG OFFSET_PS_DIRPROP = 0x0000004C; static const ULONG OFFSET_PS_GUID = 0x00000050; -static const ULONG OFFSET_PS_TSS1 = 0x00000064; -static const ULONG OFFSET_PS_TSD1 = 0x00000068; -static const ULONG OFFSET_PS_TSS2 = 0x0000006C; -static const ULONG OFFSET_PS_TSD2 = 0x00000070; +static const ULONG OFFSET_PS_CTIMELOW = 0x00000064; +static const ULONG OFFSET_PS_CTIMEHIGH = 0x00000068; +static const ULONG OFFSET_PS_MTIMELOW = 0x0000006C; +static const ULONG OFFSET_PS_MTIMEHIGH = 0x00000070; static const ULONG OFFSET_PS_STARTBLOCK = 0x00000074; static const ULONG OFFSET_PS_SIZE = 0x00000078; static const WORD DEF_BIG_BLOCK_SIZE_BITS = 0x0009; @@ -136,10 +136,8 @@ struct StgProperty ULONG nextProperty; ULONG dirProperty; GUID propertyUniqueID; - ULONG timeStampS1; - ULONG timeStampD1; - ULONG timeStampS2; - ULONG timeStampD2; + FILETIME ctime; + FILETIME mtime; ULONG startingBlock; ULARGE_INTEGER size; };

1 0

Vincent Povirk : ole32: Rename previous/nextProperty to left/rightChild.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: dce1ec06c8f034480abc775b13ef520af2555e81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dce1ec06c8f034480abc775b1… Author: Vincent Povirk <madewokherd(a)gmail.com> Date: Fri Oct 23 13:36:59 2009 -0500 ole32: Rename previous/nextProperty to left/rightChild. These fields are used to build a binary tree of elements in a storage. This should make the usage clearer. --- dlls/ole32/storage32.c | 116 ++++++++++++++++++++++++------------------------ dlls/ole32/storage32.h | 8 ++-- 2 files changed, 62 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dce1ec06c8f034480abc7…

1 0

Jeremy White : oleaut32: StructArg tests cannot rely on an unpacked structure memcmp.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 1e0b8367124c8a10648f665ff6edb9d8d3c92788 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0b8367124c8a10648f665ff… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Sat Oct 24 17:13:17 2009 -0500 oleaut32: StructArg tests cannot rely on an unpacked structure memcmp. --- dlls/oleaut32/tests/tmarshal.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index b73a0da..9b14613 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -521,9 +521,18 @@ static HRESULT WINAPI Widget_StructArgs( MYSTRUCT *byptr, MYSTRUCT arr[5]) { - ok(memcmp(&byval, &MYSTRUCT_BYVAL, sizeof(MYSTRUCT))==0, "Struct parameter passed by value corrupted\n"); - ok(memcmp(byptr, &MYSTRUCT_BYPTR, sizeof(MYSTRUCT))==0, "Struct parameter passed by pointer corrupted\n"); - ok(memcmp(arr, MYSTRUCT_ARRAY, sizeof(MYSTRUCT_ARRAY))==0, "Array of structs corrupted\n"); + int i, diff = 0; + ok(byval.field1 == MYSTRUCT_BYVAL.field1 && + byval.field2 == MYSTRUCT_BYVAL.field2, + "Struct parameter passed by value corrupted\n"); + ok(byptr->field1 == MYSTRUCT_BYPTR.field1 && + byptr->field2 == MYSTRUCT_BYPTR.field2, + "Struct parameter passed by pointer corrupted\n"); + for (i = 0; i < 5; i++) + if (arr[i].field1 != MYSTRUCT_ARRAY[i].field1 || + arr[i].field2 != MYSTRUCT_ARRAY[i].field2) + diff++; + ok(diff == 0, "Array of structs corrupted\n"); return S_OK; }

1 0

Nikolay Sivov : comctl32/tests: Release Imagelist handles when no needed anymore.
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: eaa939e9425e5903f26535a0e7015d4b6bc1f232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa939e9425e5903f26535a0e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Oct 24 19:33:36 2009 +0400 comctl32/tests: Release Imagelist handles when no needed anymore. --- dlls/comctl32/tests/toolbar.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 3b3708b..41f4f2d 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -373,6 +373,8 @@ static void test_add_bitmap(void) addbmp.hInst = HINST_COMMCTRL; addbmp.nID = IDB_STD_SMALL_COLOR; rebuild_toolbar(&hToolbar); + ImageList_Destroy(himl); + ok(SendMessageA(hToolbar, TB_ADDBITMAP, 1, (LPARAM)&addbmp) == 0, "TB_ADDBITMAP - unexpected return\n"); CHECK_IMAGELIST(15, 16, 16); compare((int)SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0), MAKELONG(23, 22), "%x"); @@ -980,6 +982,7 @@ static void test_sizes(void) rebuild_toolbar(&hToolbar); ImageList_Destroy(himl); + ImageList_Destroy(himl2); SendMessageA(hToolbar, TB_ADDBUTTONS, 1, (LPARAM)&buttons3[3]); ok(SendMessageA(hToolbar, TB_GETBUTTONSIZE, 0, 0) == MAKELONG(27, 39), "Unexpected button size\n");

1 0

Francois Gouget : mmsystem.dll16: Reorder the thread and time functions to avoid the need for forward declarations .
by Alexandre Julliard Oct. 26, 2009

Oct. 26, 2009

Module: wine Branch: master Commit: 959ced4e3c65d3702043cd2cef1bd2f78e4174d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=959ced4e3c65d3702043cd2ce… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Oct 26 09:28:38 2009 +0100 mmsystem.dll16: Reorder the thread and time functions to avoid the need for forward declarations. --- dlls/mmsystem.dll16/mmsystem.c | 563 ++++++++++++++++++++-------------------- 1 files changed, 280 insertions(+), 283 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=959ced4e3c65d3702043c…

1 0