September 2011 - Wine-Commits

Lucas Fialho Zawacki : dinput: Initialize device count to 0 in config.c.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: 03fa9f627b81c7129d9a7c1591e93f8aa3dd1b82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03fa9f627b81c7129d9a7c159… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Tue Sep 13 02:54:58 2011 -0300 dinput: Initialize device count to 0 in config.c. --- dlls/dinput/config.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/config.c b/dlls/dinput/config.c index dee76a3..98a542c 100644 --- a/dlls/dinput/config.c +++ b/dlls/dinput/config.c @@ -191,6 +191,7 @@ static void init_devices(HWND dialog, IDirectInput8W *lpDI, DIDevicesData *data, int i; /* Count devices */ + data->ndevices = 0; IDirectInput8_EnumDevicesBySemantics(lpDI, NULL, lpdiaf, count_devices, (LPVOID) data, 0); /* Allocate devices */

1 0

Henri Verbeet : ddraw: Get rid of an unused prototype.
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: be32dd86d61c2bb9dace287e9cdf469619a7191e URL: http://source.winehq.org/git/wine.git/?a=commit;h=be32dd86d61c2bb9dace287e9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 12 19:51:15 2011 +0200 ddraw: Get rid of an unused prototype. --- dlls/ddraw/ddraw_private.h | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 1daefbc..09e9aed 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -133,8 +133,6 @@ HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) DECLSPEC_ /* Utility functions */ void DDRAW_Convert_DDSCAPS_1_To_2(const DDSCAPS *pIn, DDSCAPS2 *pOut) DECLSPEC_HIDDEN; void DDRAW_Convert_DDDEVICEIDENTIFIER_2_To_1(const DDDEVICEIDENTIFIER2 *pIn, DDDEVICEIDENTIFIER *pOut) DECLSPEC_HIDDEN; -HRESULT WINAPI ddraw_recreate_surfaces_cb(IDirectDrawSurface7 *surf, - DDSURFACEDESC2 *desc, void *Context) DECLSPEC_HIDDEN; struct wined3d_vertex_declaration *ddraw_find_decl(IDirectDrawImpl *This, DWORD fvf) DECLSPEC_HIDDEN; /* The default surface type */

1 0

Henri Verbeet : ddraw: Get rid of some ERRs in PixelFormat_DD2WineD3D().
by Alexandre Julliard Sept. 13, 2011

Sept. 13, 2011

Module: wine Branch: master Commit: f2115004d551e337799b03b9739546536fa2619a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2115004d551e337799b03b97… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 12 19:51:16 2011 +0200 ddraw: Get rid of some ERRs in PixelFormat_DD2WineD3D(). Most of these would just be the result of the application giving us invalid pixel formats. --- dlls/ddraw/utils.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index d2a4194..b341a78 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -426,7 +426,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat { return WINED3DFMT_B2G3R3A8_UNORM; } - ERR("16 bit RGB Pixel format does not match\n"); + WARN("16 bit RGB Pixel format does not match.\n"); return WINED3DFMT_UNKNOWN; case 24: @@ -445,10 +445,10 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat return WINED3DFMT_B8G8R8X8_UNORM; } - ERR("32 bit RGB pixel format does not match\n"); + WARN("32 bit RGB pixel format does not match.\n"); default: - ERR("Invalid dwRGBBitCount in Pixelformat structure\n"); + WARN("Invalid dwRGBBitCount in Pixelformat structure.\n"); return WINED3DFMT_UNKNOWN; } } @@ -460,12 +460,12 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat case 1: case 2: case 4: - ERR("Unsupported Alpha-Only bit depth 0x%x\n", DDPixelFormat->u1.dwAlphaBitDepth); + FIXME("Unsupported Alpha-Only bit depth 0x%x.\n", DDPixelFormat->u1.dwAlphaBitDepth); case 8: return WINED3DFMT_A8_UNORM; default: - ERR("Invalid AlphaBitDepth in Alpha-Only Pixelformat\n"); + WARN("Invalid AlphaBitDepth in Alpha-Only Pixelformat.\n"); return WINED3DFMT_UNKNOWN; } } @@ -480,17 +480,17 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat case 4: if(DDPixelFormat->u1.dwAlphaBitDepth == 4) return WINED3DFMT_L4A4_UNORM; - ERR("Unknown Alpha / Luminance bit depth combination\n"); + WARN("Unknown Alpha / Luminance bit depth combination.\n"); return WINED3DFMT_UNKNOWN; case 6: - ERR("A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now!!\n"); + FIXME("A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now.\n"); return WINED3DFMT_R5G5_SNORM_L6_UNORM; case 8: if(DDPixelFormat->u1.dwAlphaBitDepth == 8) return WINED3DFMT_L8A8_UNORM; - ERR("Unknown Alpha / Lumincase bit depth combination\n"); + WARN("Unknown Alpha / Lumincase bit depth combination.\n"); return WINED3DFMT_UNKNOWN; } } @@ -500,14 +500,14 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat switch(DDPixelFormat->u1.dwLuminanceBitCount) { case 6: - ERR("A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now!!\n"); + FIXME("A luminance Pixelformat shouldn't have 6 luminance bits. Returning D3DFMT_L6V5U5 for now.\n"); return WINED3DFMT_R5G5_SNORM_L6_UNORM; case 8: return WINED3DFMT_L8_UNORM; default: - ERR("Unknown luminance-only bit depth 0x%x\n", DDPixelFormat->u1.dwLuminanceBitCount); + WARN("Unknown luminance-only bit depth 0x%x.\n", DDPixelFormat->u1.dwLuminanceBitCount); return WINED3DFMT_UNKNOWN; } } @@ -599,7 +599,7 @@ enum wined3d_format_id PixelFormat_DD2WineD3D(const DDPIXELFORMAT *DDPixelFormat } } - ERR("Unknown Pixelformat!\n"); + WARN("Unknown Pixelformat.\n"); return WINED3DFMT_UNKNOWN; }

1 0

Bernhard Loos : msi: Speed up WHERE statement evaluation by evaluating the condition as early as possible .
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 9b729bb1b348ac5485fe993fcedef870b59d88b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b729bb1b348ac5485fe993fc… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Fri Sep 9 11:25:58 2011 +0200 msi: Speed up WHERE statement evaluation by evaluating the condition as early as possible. --- dlls/msi/where.c | 208 +++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 145 insertions(+), 63 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b729bb1b348ac5485fe9…

1 0

Piotr Caban : msvcp90: Added basic_string::operator=(char) implementation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: c0f991e9b1ef258b926f57e6345f80036657ecf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0f991e9b1ef258b926f57e63… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:11:16 2011 +0200 msvcp90: Added basic_string::operator=(char) implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 32c3766..d5d1ca3 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -1382,8 +1382,8 @@ @ cdecl -arch=win64 ??4?$allocator(a)_W@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_allocator_wchar_assign @ thiscall -arch=win32 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)ABV01@@Z(ptr ptr) MSVCP_basic_string_char_assign @ cdecl -arch=win64 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_basic_string_char_assign -@ stub -arch=win32 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)D@Z -@ stub -arch=win64 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)D@Z +@ thiscall -arch=win32 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)D@Z(ptr long) MSVCP_basic_string_char_assign_ch +@ cdecl -arch=win64 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)D@Z(ptr long) MSVCP_basic_string_char_assign_ch @ thiscall -arch=win32 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)PBD@Z(ptr ptr) MSVCP_basic_string_char_assign_cstr @ cdecl -arch=win64 ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)PEBD@Z(ptr ptr) MSVCP_basic_string_char_assign_cstr @ stub -arch=win32 ??4?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV01(a)ABV01@@Z @@ -1396,8 +1396,8 @@ @ cdecl -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)AEBV01@@Z(ptr ptr) MSVCP_basic_string_wchar_assign @ thiscall -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z(ptr wstr) MSVCP_basic_string_wchar_assign_cstr @ cdecl -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)PEB_W@Z(ptr wstr) MSVCP_basic_string_wchar_assign_cstr -@ stub -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)_W@Z -@ stub -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)_W@Z +@ thiscall -arch=win32 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)_W@Z(ptr long) MSVCP_basic_string_wchar_assign_ch +@ cdecl -arch=win64 ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)_W@Z(ptr long) MSVCP_basic_string_wchar_assign_ch @ stub -arch=win32 ??4?$char_traits(a)D@std@@QAEAAU01(a)ABU01@@Z @ stub -arch=win64 ??4?$char_traits(a)D@std@@QEAAAEAU01(a)AEBU01@@Z @ stub -arch=win32 ??4?$char_traits(a)G@std@@QAEAAU01(a)ABU01@@Z diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 6260ee8..c161335 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -697,6 +697,15 @@ basic_string_char* __thiscall MSVCP_basic_string_char_assign_cstr_len( return this; } +/* ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)D@Z */ +/* ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV01(a)D@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_assign_ch, 8) +basic_string_char* __thiscall MSVCP_basic_string_char_assign_ch( + basic_string_char *this, char ch) +{ + return MSVCP_basic_string_char_assign_cstr_len(this, &ch, 1); +} + /* ?assign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)PBD@Z */ /* ?assign@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)PEBD@Z */ /* ??4?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV01(a)PBD@Z */ @@ -1573,6 +1582,15 @@ basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_cstr_len( return this; } +/* ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)_W@Z */ +/* ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV01(a)_W@Z */ +DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_assign_ch, 8) +basic_string_wchar* __thiscall MSVCP_basic_string_wchar_assign_ch( + basic_string_wchar *this, wchar_t ch) +{ + return MSVCP_basic_string_wchar_assign_cstr_len(this, &ch, 1); +} + /* ?assign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)PB_W@Z */ /* ?assign@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)PEB_W@Z */ /* ??4?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV01(a)PB_W@Z */

1 0

Piotr Caban : msvcp90: Added basic_string::substr(size_t, size_t) implementation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 145f6c14f2f7469f903594d3258b3287edd2b3e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=145f6c14f2f7469f903594d32… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:10:58 2011 +0200 msvcp90: Added basic_string::substr(size_t, size_t) implementation. --- dlls/msvcp90/msvcp90.spec | 8 ++++---- dlls/msvcp90/string.c | 26 ++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index fc6cf20..66ec6a0 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -5496,12 +5496,12 @@ @ stub -arch=win64 ?str@?$basic_stringstream(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA?AV?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)XZ @ stub -arch=win32 ?str(a)strstreambuf@std@@QAEPADXZ @ stub -arch=win64 ?str(a)strstreambuf@std@@QEAAPEADXZ -@ stub -arch=win32 ?substr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE?AV12(a)II@Z -@ stub -arch=win64 ?substr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA?AV12(a)_K0@Z +@ thiscall -arch=win32 ?substr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE?AV12(a)II@Z(ptr ptr long long) MSVCP_basic_string_char_substr +@ cdecl -arch=win64 ?substr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA?AV12(a)_K0@Z(ptr ptr long long) MSVCP_basic_string_char_substr @ stub -arch=win32 ?substr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QBE?AV12(a)II@Z @ stub -arch=win64 ?substr@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QEBA?AV12(a)_K0@Z -@ stub -arch=win32 ?substr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE?AV12(a)II@Z -@ stub -arch=win64 ?substr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA?AV12(a)_K0@Z +@ thiscall -arch=win32 ?substr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE?AV12(a)II@Z(ptr ptr long long) MSVCP_basic_string_wchar_substr +@ cdecl -arch=win64 ?substr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA?AV12(a)_K0@Z(ptr ptr long long) MSVCP_basic_string_wchar_substr @ thiscall -arch=win32 ?sungetc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QAEHXZ(ptr) basic_streambuf_char_sungetc @ cdecl -arch=win64 ?sungetc@?$basic_streambuf(a)DU?$char_traits(a)D@std@@@std@@QEAAHXZ(ptr) basic_streambuf_char_sungetc @ stub -arch=win32 ?sungetc@?$basic_streambuf(a)GU?$char_traits(a)G@std@@@std@@QAEGXZ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 1d15331..2ad568c 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -847,6 +847,19 @@ void __thiscall MSVCP_basic_string_char_swap(basic_string_char *this, basic_stri } } +/* ?substr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE?AV12(a)II@Z */ +/* ?substr@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEBA?AV12(a)_K0@Z */ +DEFINE_THISCALL_WRAPPER_RETPTR(MSVCP_basic_string_char_substr, 12) +basic_string_char __thiscall MSVCP_basic_string_char_substr( + basic_string_char *this, MSVCP_size_t off, MSVCP_size_t len) +{ + basic_string_char ret = { 0 }; + TRACE("%p %lu %lu\n", this, off, len); + + MSVCP_basic_string_char_ctor_substr(&ret, this, off, len); + return ret; +} + /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)ABV12@II(a)Z */ /* ?append@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)AEBV12@_K1(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_char_append_substr, 16) @@ -1700,6 +1713,19 @@ void __thiscall MSVCP_basic_string_wchar_swap(basic_string_wchar *this, basic_st } } +/* ?substr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QBE?AV12(a)II@Z */ +/* ?substr@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEBA?AV12(a)_K0@Z */ +DEFINE_THISCALL_WRAPPER_RETPTR(MSVCP_basic_string_wchar_substr, 12) +basic_string_wchar __thiscall MSVCP_basic_string_wchar_substr( + basic_string_wchar *this, MSVCP_size_t off, MSVCP_size_t len) +{ + basic_string_wchar ret = { 0 }; + TRACE("%p %lu %lu\n", this, off, len); + + MSVCP_basic_string_wchar_ctor_substr(&ret, this, off, len); + return ret; +} + /* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)ABV12@II(a)Z */ /* ?append@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)AEBV12@_K1(a)Z */ DEFINE_THISCALL_WRAPPER(MSVCP_basic_string_wchar_append_substr, 16)

1 0

Bernhard Loos : msi: The underlying tables might have changed, so it' s not possible to cache the result of the execute.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: dc16dd135191bd68ea21130bd5e62d4a844f7ce0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc16dd135191bd68ea21130bd… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Fri Sep 9 11:25:51 2011 +0200 msi: The underlying tables might have changed, so it's not possible to cache the result of the execute. --- dlls/msi/tests/db.c | 24 +++++++++++++++++++++++- dlls/msi/where.c | 35 ++++++++++++++--------------------- 2 files changed, 37 insertions(+), 22 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index b581633..b915fa0 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -297,7 +297,7 @@ make_add_entry(binary, static void test_msiinsert(void) { - MSIHANDLE hdb = 0, hview = 0, hrec = 0; + MSIHANDLE hdb = 0, hview = 0, hview2 = 0, hrec = 0; UINT r; const char *query; char buf[80]; @@ -322,6 +322,14 @@ static void test_msiinsert(void) r = MsiCloseHandle(hview); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + query = "SELECT * FROM phone WHERE number = '8675309'"; + r = MsiDatabaseOpenView(hdb, query, &hview2); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview2, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview2, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "MsiViewFetch produced items\n"); + /* insert a value into it */ query = "INSERT INTO `phone` ( `id`, `name`, `number` )" "VALUES('1', 'Abe', '8675309')"; @@ -334,6 +342,20 @@ static void test_msiinsert(void) r = MsiCloseHandle(hview); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + r = MsiViewFetch(hview2, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "MsiViewFetch produced items\n"); + r = MsiViewExecute(hview2, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview2, &hrec); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed: %u\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + r = MsiViewClose(hview2); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview2); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + query = "SELECT * FROM `phone` WHERE `id` = 1"; r = do_query(hdb, query, &hrec); ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 0e346d6..17b655b 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -73,27 +73,10 @@ typedef struct tagMSIWHEREVIEW struct expr *cond; UINT rec_index; MSIORDERINFO *order_info; - UINT error; } MSIWHEREVIEW; #define INITIAL_REORDER_SIZE 16 -static UINT init_reorder(MSIWHEREVIEW *wv) -{ - MSIROWENTRY **new = msi_alloc_zero(sizeof(MSIROWENTRY *) * INITIAL_REORDER_SIZE); - if (!new) - return ERROR_OUTOFMEMORY; - - if (wv->reorder) - msi_free(wv->reorder); - - wv->reorder = new; - wv->reorder_size = INITIAL_REORDER_SIZE; - wv->row_count = 0; - - return ERROR_SUCCESS; -} - static void free_reorder(MSIWHEREVIEW *wv) { UINT i; @@ -110,6 +93,20 @@ static void free_reorder(MSIWHEREVIEW *wv) wv->row_count = 0; } +static UINT init_reorder(MSIWHEREVIEW *wv) +{ + MSIROWENTRY **new = msi_alloc_zero(sizeof(MSIROWENTRY *) * INITIAL_REORDER_SIZE); + if (!new) + return ERROR_OUTOFMEMORY; + + free_reorder(wv); + + wv->reorder = new; + wv->reorder_size = INITIAL_REORDER_SIZE; + + return ERROR_SUCCESS; +} + static inline UINT find_row(MSIWHEREVIEW *wv, UINT row, UINT *(values[])) { if (row >= wv->row_count) @@ -618,9 +615,6 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if( !table ) return ERROR_FUNCTION_FAILED; - if (wv->reorder) - return wv->error; - r = init_reorder(wv); if (r != ERROR_SUCCESS) return r; @@ -654,7 +648,6 @@ static UINT WHERE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) r = wv->order_info->error; msi_free( rows ); - wv->error = r; return r; }

1 0

Erich Hoover : quartz: Fix converting between the media time and REFTIME.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 09f134cb69209a94ca1a61da8841ea39d470f2a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09f134cb69209a94ca1a61da8… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Sep 11 14:11:10 2011 -0600 quartz: Fix converting between the media time and REFTIME. --- dlls/quartz/filtergraph.c | 67 +++++++++++++++++++++++++++++++++++++++------ 1 files changed, 58 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 1becf11..c154f92 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -2621,21 +2621,62 @@ static HRESULT WINAPI MediaPosition_Invoke(IMediaPosition* iface, DISPID dispIdM return E_NOTIMPL; } +static HRESULT ConvertFromREFTIME(IMediaSeeking *seek, REFTIME time_in, LONGLONG *time_out) +{ + GUID time_format; + HRESULT hr; + + hr = MediaSeeking_GetTimeFormat(seek, &time_format); + if (FAILED(hr)) + return hr; + if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, &time_format)) + { + FIXME("Unsupported time format.\n"); + return E_NOTIMPL; + } + + *time_out = (LONGLONG) (time_in * 10000000); /* convert from 1 second intervals to 100 ns intervals */ + return S_OK; +} + +static HRESULT ConvertToREFTIME(IMediaSeeking *seek, LONGLONG time_in, REFTIME *time_out) +{ + GUID time_format; + HRESULT hr; + + hr = MediaSeeking_GetTimeFormat(seek, &time_format); + if (FAILED(hr)) + return hr; + if (!IsEqualGUID(&TIME_FORMAT_MEDIA_TIME, &time_format)) + { + FIXME("Unsupported time format.\n"); + return E_NOTIMPL; + } + + *time_out = (REFTIME)time_in / 10000000; /* convert from 100 ns intervals to 1 second intervals */ + return S_OK; +} + /*** IMediaPosition methods ***/ static HRESULT WINAPI MediaPosition_get_Duration(IMediaPosition * iface, REFTIME *plength) { LONGLONG duration; IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); HRESULT hr = IMediaSeeking_GetDuration(&This->IMediaSeeking_iface, &duration); - if (SUCCEEDED(hr)) *plength = duration; - return hr; + if (FAILED(hr)) + return hr; + return ConvertToREFTIME(&This->IMediaSeeking_iface, duration, plength); } static HRESULT WINAPI MediaPosition_put_CurrentPosition(IMediaPosition * iface, REFTIME llTime) { IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); - LONGLONG reftime = llTime; + LONGLONG reftime; + HRESULT hr; + hr = ConvertFromREFTIME(&This->IMediaSeeking_iface, llTime, &reftime); + if (FAILED(hr)) + return hr; return IMediaSeeking_SetPositions(&This->IMediaSeeking_iface, &reftime, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); } @@ -2644,9 +2685,12 @@ static HRESULT WINAPI MediaPosition_get_CurrentPosition(IMediaPosition * iface, { IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); LONGLONG pos; - HRESULT hr = IMediaSeeking_GetCurrentPosition(&This->IMediaSeeking_iface, &pos); - if (SUCCEEDED(hr)) *pllTime = pos; - return hr; + HRESULT hr; + + hr = IMediaSeeking_GetCurrentPosition(&This->IMediaSeeking_iface, &pos); + if (FAILED(hr)) + return hr; + return ConvertToREFTIME(&This->IMediaSeeking_iface, pos, pllTime); } static HRESULT WINAPI MediaPosition_get_StopTime(IMediaPosition * iface, REFTIME *pllTime) @@ -2654,15 +2698,20 @@ static HRESULT WINAPI MediaPosition_get_StopTime(IMediaPosition * iface, REFTIME IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); LONGLONG pos; HRESULT hr = IMediaSeeking_GetStopPosition(&This->IMediaSeeking_iface, &pos); - if (SUCCEEDED(hr)) *pllTime = pos; - return hr; + if (FAILED(hr)) + return hr; + return ConvertToREFTIME(&This->IMediaSeeking_iface, pos, pllTime); } static HRESULT WINAPI MediaPosition_put_StopTime(IMediaPosition * iface, REFTIME llTime) { IFilterGraphImpl *This = impl_from_IMediaPosition( iface ); - LONGLONG reftime = llTime; + LONGLONG reftime; + HRESULT hr; + hr = ConvertFromREFTIME(&This->IMediaSeeking_iface, llTime, &reftime); + if (FAILED(hr)) + return hr; return IMediaSeeking_SetPositions(&This->IMediaSeeking_iface, NULL, AM_SEEKING_NoPositioning, &reftime, AM_SEEKING_AbsolutePositioning); }

1 0

Erich Hoover : quartz: Do not assert when IAsyncReader:: WaitForNext returns VFW_E_TIMEOUT.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: bc204370aeb7b1062ef89f2eef8fae46287c0ed6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc204370aeb7b1062ef89f2ee… Author: Erich Hoover <ehoover(a)mines.edu> Date: Sun Sep 11 14:10:19 2011 -0600 quartz: Do not assert when IAsyncReader::WaitForNext returns VFW_E_TIMEOUT. --- dlls/quartz/pin.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/pin.c b/dlls/quartz/pin.c index af26a6b..4c6a84d 100644 --- a/dlls/quartz/pin.c +++ b/dlls/quartz/pin.c @@ -478,14 +478,15 @@ static void PullPin_Thread_Process(PullPin *This) } else { - /* FIXME: This is not well handled yet! */ - ERR("Processing error: %x\n", hr); if (hr == VFW_E_TIMEOUT) { - assert(!pSample); + if (pSample != NULL) + WARN("Non-NULL sample returned with VFW_E_TIMEOUT.\n"); hr = S_OK; - continue; } + /* FIXME: Errors are not well handled yet! */ + else + ERR("Processing error: %x\n", hr); } if (pSample)

1 0

Piotr Caban : msvcp: Sync spec files.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: aa19d0cf5f366830d7e4b47ca6f556a16f4c08f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa19d0cf5f366830d7e4b47ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 12 13:11:36 2011 +0200 msvcp: Sync spec files. --- dlls/msvcp60/msvcp60.spec | 24 +++++++++--------- dlls/msvcp70/msvcp70.spec | 56 ++++++++++++++++++++++---------------------- dlls/msvcp71/msvcp71.spec | 52 +++++++++++++++++++++--------------------- dlls/msvcp80/msvcp80.spec | 52 +++++++++++++++++++++--------------------- 4 files changed, 92 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa19d0cf5f366830d7e4b…

1 0