January 2010 - Wine-Commits

Huw Davies : include: Add the ability to initialize oledb constants independently of the INITGUID define by defining DBINITCONSTANTS instead .
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 10f6d5c1fa7ec140a2e5cf4a46d3b61f289d8a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=10f6d5c1fa7ec140a2e5cf4a4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 15 16:28:37 2010 +0000 include: Add the ability to initialize oledb constants independently of the INITGUID define by defining DBINITCONSTANTS instead. --- include/dbs.idl | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index a2ed656..8ca2e2a 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -183,10 +183,27 @@ enum DBSTATUSENUM DBSTATUS_S_DEFAULT = 13 }; -cpp_quote("DEFINE_GUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") -cpp_quote("DEFINE_GUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") -cpp_quote("DEFINE_GUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") -cpp_quote("DEFINE_GUID(DBGUID_STREAM, 0xc8b522f9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("#ifdef DBINITCONSTANTS") +cpp_quote("#ifdef __cplusplus") +cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\") +cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN; \\") +cpp_quote(" EXTERN_C const GUID name = \\") +cpp_quote(" { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }") +cpp_quote("#else") +cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\") +cpp_quote(" const GUID name DECLSPEC_HIDDEN; \\") +cpp_quote(" const GUID name = \\") +cpp_quote(" { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }") +cpp_quote("#endif") +cpp_quote("#else") +cpp_quote("#define DEFINE_DBGUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \\") +cpp_quote(" EXTERN_C const GUID name DECLSPEC_HIDDEN") +cpp_quote("#endif") + +cpp_quote("DEFINE_DBGUID(DBGUID_SESSION, 0xc8b522f5, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBGUID_ROWSET, 0xc8b522f6, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBGUID_ROW, 0xc8b522f7, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") +cpp_quote("DEFINE_DBGUID(DBGUID_STREAM, 0xc8b522f9, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") typedef struct tagDBCOLUMNACCESS {

1 0

Andrew Nguyen : msvcrt: Implement and test rand_s.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 841fc1805e4032af79acacfda6ccb010884c5a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=841fc1805e4032af79acacfda… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Fri Jan 15 11:02:56 2010 -0600 msvcrt: Implement and test rand_s. --- dlls/msvcrt/Makefile.in | 2 +- dlls/msvcrt/misc.c | 14 ++++++++++ dlls/msvcrt/msvcrt.spec | 1 + dlls/msvcrt/tests/Makefile.in | 1 + dlls/msvcrt/tests/misc.c | 58 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in index 7c2b25e..e5f6910 100644 --- a/dlls/msvcrt/Makefile.in +++ b/dlls/msvcrt/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = msvcrt.dll IMPORTLIB = msvcrt IMPORTS = kernel32 ntdll -DELAYIMPORTS = user32 +DELAYIMPORTS = advapi32 user32 C_SRCS = \ console.c \ diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 082c38b..c345589 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -25,6 +25,7 @@ #include "msvcrt.h" #include "wine/debug.h" +#include "ntsecapi.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -61,6 +62,19 @@ int CDECL MSVCRT_rand(void) } /********************************************************************* + * rand_s (MSVCRT.@) + */ +int CDECL MSVCRT_rand_s(unsigned int *pval) +{ + if (!pval || !RtlGenRandom(pval, sizeof(*pval))) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + return 0; +} + +/********************************************************************* * _sleep (MSVCRT.@) */ void CDECL MSVCRT__sleep(MSVCRT_ulong timeout) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ff7d971..2b3d22c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -736,6 +736,7 @@ @ cdecl qsort(ptr long long ptr) ntdll.qsort @ cdecl raise(long) MSVCRT_raise @ cdecl rand() MSVCRT_rand +@ cdecl rand_s(ptr) MSVCRT_rand_s @ cdecl realloc(ptr long) MSVCRT_realloc @ cdecl remove(str) MSVCRT_remove @ cdecl rename(str str) MSVCRT_rename diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in index d0486d1..c964427 100644 --- a/dlls/msvcrt/tests/Makefile.in +++ b/dlls/msvcrt/tests/Makefile.in @@ -16,6 +16,7 @@ CTESTS = \ file.c \ headers.c \ heap.c \ + misc.c \ printf.c \ scanf.c \ signal.c \ diff --git a/dlls/msvcrt/tests/misc.c b/dlls/msvcrt/tests/misc.c new file mode 100644 index 0000000..1f069fa --- /dev/null +++ b/dlls/msvcrt/tests/misc.c @@ -0,0 +1,58 @@ +/* + * Unit tests for miscellaneous msvcrt functions + * + * Copyright 2010 Andrew Nguyen + * + * 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 "wine/test.h" +#include <errno.h> + +static int (__cdecl *prand_s)(unsigned int *); + +static void init(void) +{ + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + + prand_s = (void *)GetProcAddress(hmod, "rand_s"); +} + +static void test_rand_s(void) +{ + int ret; + unsigned int rand; + + if (!prand_s) + { + win_skip("rand_s is not available\n"); + return; + } + + errno = EBADF; + ret = prand_s(NULL); + ok(ret == EINVAL, "Expected rand_s to return EINVAL, got %d\n", ret); + ok(errno == EINVAL, "Expected errno to return EINVAL, got %d\n", errno); + + ret = prand_s(&rand); + ok(ret == 0, "Expected rand_s to return 0, got %d\n", ret); +} + +START_TEST(misc) +{ + init(); + + test_rand_s(); +}

1 0

Christian Costa : d3drm: Add definitions for IDirect3DRMFrame.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 547eb0367ac4959a66c5de81a3d617bdf212661e URL: http://source.winehq.org/git/wine.git/?a=commit;h=547eb0367ac4959a66c5de81a… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 15 11:37:07 2010 +0100 d3drm: Add definitions for IDirect3DRMFrame. --- include/d3drmdef.h | 37 ++++++++ include/d3drmobj.h | 232 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 269 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=547eb0367ac4959a66c5d…

1 0

Piotr Caban : jscript: Make Array.join generic.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: db137cc975cd05451f5235ebe948fc640204be84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db137cc975cd05451f5235ebe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 15 08:17:50 2010 +0100 jscript: Make Array.join generic. --- dlls/jscript/array.c | 16 +++++++--------- dlls/jscript/tests/api.js | 11 +++++++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index bb54493..5acfa01 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -342,20 +342,18 @@ static HRESULT array_join(script_ctx_t *ctx, DispatchEx *array, DWORD length, co } /* ECMA-262 3rd Edition 15.4.4.5 */ -static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, +static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { + DispatchEx *jsthis; DWORD length; HRESULT hres; TRACE("\n"); - if(is_vclass(jsthis, JSCLASS_ARRAY)) { - length = array_from_vdisp(jsthis)->length; - }else { - FIXME("dispid is not Array\n"); - return E_NOTIMPL; - } + hres = get_length(ctx, vthis, ei, &jsthis, &length); + if(FAILED(hres)) + return hres; if(arg_cnt(dp)) { BSTR sep; @@ -364,11 +362,11 @@ static HRESULT Array_join(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPA if(FAILED(hres)) return hres; - hres = array_join(ctx, jsthis->u.jsdisp, length, sep, retv, ei, caller); + hres = array_join(ctx, jsthis, length, sep, retv, ei, caller); SysFreeString(sep); }else { - hres = array_join(ctx, jsthis->u.jsdisp, length, default_separatorW, retv, ei, caller); + hres = array_join(ctx, jsthis, length, default_separatorW, retv, ei, caller); } return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 69deab2..40193a7 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -654,6 +654,16 @@ ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); tmp = arr.toString("test"); ok(tmp === "1,2,,false,,,a", "arr.toString() = " + tmp); +arr = new Object(); +arr.length = 3; +arr[0] = "aa"; +arr[2] = 2; +arr[7] = 3; +arr.join = Array.prototype.join; +tmp = arr.join(","); +ok(arr.length === 3, "arr.length = " + arr.length); +ok(tmp === "aa,,2", "tmp = " + tmp); + arr = [5,true,2,-1,3,false,"2.5"]; tmp = arr.sort(function(x,y) { return y-x; }); ok(tmp === arr, "tmp !== arr"); @@ -1880,6 +1890,7 @@ testArrayHostThis("slice"); testArrayHostThis("splice"); testArrayHostThis("unshift"); testArrayHostThis("reverse"); +testArrayHostThis("join"); function testObjectInherit(obj, constr, ts, tls, vo) { ok(obj instanceof Object, "obj is not instance of Object");

1 0

Paul Vriens : user32/tests: Run tests again on Win95.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 5da7043c521ad0fe44dfd0ef09c6034e25b93cb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da7043c521ad0fe44dfd0ef0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jan 15 09:31:28 2010 +0100 user32/tests: Run tests again on Win95. --- dlls/user32/tests/win.c | 32 ++++++++++++++++++++++---------- 1 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 34ff9d0..7bf498e 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -52,6 +52,7 @@ static BOOL (WINAPI *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD); static BOOL (WINAPI *pGetMonitorInfoA)(HMONITOR,LPMONITORINFO); static HMONITOR (WINAPI *pMonitorFromPoint)(POINT,DWORD); static int (WINAPI *pGetWindowRgnBox)(HWND,LPRECT); +static BOOL (WINAPI *pGetGUIThreadInfo)(DWORD, GUITHREADINFO*); static BOOL test_lbuttondown_flag; static HWND hwndMessage; @@ -2707,12 +2708,15 @@ static LRESULT CALLBACK test_capture_4_proc(HWND hWnd, UINT msg, WPARAM wParam, case WM_CAPTURECHANGED: /* now try to release capture from menu. this should fail */ - memset(&gti, 0, sizeof(GUITHREADINFO)); - gti.cbSize = sizeof(GUITHREADINFO); - status = GetGUIThreadInfo(GetCurrentThreadId(), &gti); - ok(status, "GetGUIThreadInfo() failed!\n"); + if (pGetGUIThreadInfo) + { + memset(&gti, 0, sizeof(GUITHREADINFO)); + gti.cbSize = sizeof(GUITHREADINFO); + status = pGetGUIThreadInfo(GetCurrentThreadId(), &gti); + ok(status, "GetGUIThreadInfo() failed!\n"); + ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); + } cap_wnd = GetCapture(); - ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); /* check that re-setting the capture for the menu fails */ set_cap_wnd = SetCapture(cap_wnd); @@ -2727,11 +2731,14 @@ static LRESULT CALLBACK test_capture_4_proc(HWND hWnd, UINT msg, WPARAM wParam, ok(!status, "ReleaseCapture should have failed!\n"); /* check that thread info did not change */ - memset(&gti, 0, sizeof(GUITHREADINFO)); - gti.cbSize = sizeof(GUITHREADINFO); - status = GetGUIThreadInfo(GetCurrentThreadId(), &gti); - ok(status, "GetGUIThreadInfo() failed!\n"); - ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); + if (pGetGUIThreadInfo) + { + memset(&gti, 0, sizeof(GUITHREADINFO)); + gti.cbSize = sizeof(GUITHREADINFO); + status = pGetGUIThreadInfo(GetCurrentThreadId(), &gti); + ok(status, "GetGUIThreadInfo() failed!\n"); + ok(gti.flags & GUI_INMENUMODE, "Thread info incorrect (flags=%08X)!\n", gti.flags); + } /* verify that no capture change took place */ cap_wnd2 = GetCapture(); @@ -2755,6 +2762,10 @@ static void test_capture_4(void) HWND hwnd; WNDCLASSA wclass; HINSTANCE hInstance = GetModuleHandleA( NULL ); + + if (!pGetGUIThreadInfo) + win_skip("GetGUIThreadInfo is not available\n"); + wclass.lpszClassName = "TestCapture4Class"; wclass.style = CS_HREDRAW | CS_VREDRAW; wclass.lpfnWndProc = test_capture_4_proc; @@ -5881,6 +5892,7 @@ START_TEST(win) pGetMonitorInfoA = (void *)GetProcAddress( user32, "GetMonitorInfoA" ); pMonitorFromPoint = (void *)GetProcAddress( user32, "MonitorFromPoint" ); pGetWindowRgnBox = (void *)GetProcAddress( user32, "GetWindowRgnBox" ); + pGetGUIThreadInfo = (void *)GetProcAddress( user32, "GetGUIThreadInfo" ); if (!RegisterWindowClasses()) assert(0);

1 0

Piotr Caban : jscript: Added implementation of Array.reverse.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 6f61893685b466357f264a367503cee183f39352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f61893685b466357f264a367… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 15 08:17:30 2010 +0100 jscript: Added implementation of Array.reverse. --- dlls/jscript/array.c | 37 +++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 26 ++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 873ab6e..bb54493 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -469,8 +469,41 @@ static HRESULT Array_push(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPAR static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + DispatchEx *jsthis; + DWORD length, k, l; + VARIANT v1, v2; + HRESULT hres1, hres2; + + TRACE("\n"); + + hres1 = get_length(ctx, vthis, ei, &jsthis, &length); + if(FAILED(hres1)) + return hres1; + + for(k=0; k<length/2; k++) { + l = length-k-1; + + hres1 = jsdisp_propget_idx(jsthis, k, &v1, ei, sp); + hres2 = jsdisp_propget_idx(jsthis, l, &v2, ei, sp); + + if(hres1 == DISP_E_UNKNOWNNAME) + jsdisp_delete_idx(jsthis, l); + else + jsdisp_propput_idx(jsthis, l, &v1, ei, sp); + + if(hres2 == DISP_E_UNKNOWNNAME) + jsdisp_delete_idx(jsthis, k); + else + jsdisp_propput_idx(jsthis, k, &v2, ei, sp); + } + + if(retv) { + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(jsthis); + IDispatch_AddRef(V_DISPATCH(retv)); + } + + return S_OK; } /* ECMA-262 3rd Edition 15.4.4.9 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 7ad2984..69deab2 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -688,6 +688,31 @@ ok(arr.valueOf === Object.prototype.valueOf, "arr.valueOf !== Object.prototype.v ok(arr === arr.valueOf(), "arr !== arr.valueOf"); arr = [1,2,3]; +tmp = arr.reverse(); +ok(tmp === arr, "tmp !== arr"); +ok(arr.length === 3, "arr.length = " + arr.length); +ok(arr.toString() === "3,2,1", "arr.toString() = " + arr.toString()); + +arr = []; +arr[3] = 5; +arr[5] = 1; +tmp = arr.reverse(); +ok(tmp === arr, "tmp !== arr"); +ok(arr.length === 6, "arr.length = " + arr.length); +ok(arr.toString() === "1,,5,,,", "arr.toString() = " + arr.toString()); + +arr = new Object(); +arr.length = 3; +arr[0] = "aa"; +arr[2] = 2; +arr[7] = 3; +arr.reverse = Array.prototype.reverse; +tmp = arr.reverse(); +ok(tmp === arr, "tmp !== arr"); +ok(arr.length === 3, "arr.length = " + arr.length); +ok(arr[0] === 2 && arr[1] === undefined && arr[2] === "aa", "unexpected array"); + +arr = [1,2,3]; tmp = arr.unshift(0); ok(tmp === (invokeVersion < 2 ? undefined : 4), "[1,2,3].unshift(0) returned " +tmp); ok(arr.length === 4, "arr.length = " + arr.length); @@ -1854,6 +1879,7 @@ testArrayHostThis("shift"); testArrayHostThis("slice"); testArrayHostThis("splice"); testArrayHostThis("unshift"); +testArrayHostThis("reverse"); function testObjectInherit(obj, constr, ts, tls, vo) { ok(obj instanceof Object, "obj is not instance of Object");

1 0

Christian Costa : d3drm: Add definitions for IDirect3DRMViewport.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: ef527d81eb12ac7d743d28db2607fd041cf56bed URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef527d81eb12ac7d743d28db2… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 15 11:36:54 2010 +0100 d3drm: Add definitions for IDirect3DRMViewport. --- include/d3drmdef.h | 16 ++++++ include/d3drmobj.h | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 156 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef527d81eb12ac7d743d2…

1 0

Christian Costa : d3drm: Add definitions for IDirect3DRMViewport2.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 3246b65ce549f94003d76dd4cb2b7b411594bec4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3246b65ce549f94003d76dd4c… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Fri Jan 15 11:37:00 2010 +0100 d3drm: Add definitions for IDirect3DRMViewport2. --- include/d3drmobj.h | 148 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 148 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3246b65ce549f94003d76…

1 0

Nikolay Sivov : msxml3/tests: Fix interface leak and message typo.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: e6edbc451de81f1258cb27d3f113971bbbe7aedf URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6edbc451de81f1258cb27d3f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Jan 15 00:44:19 2010 +0300 msxml3/tests: Fix interface leak and message typo. --- dlls/msxml3/tests/domdoc.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 87ad9b5..49ffe1d 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -509,8 +509,8 @@ static char *list_to_string(IXMLDOMNodeList *list) return buf; } -#define expect_node(node, expstr) { char str[4096]; node_to_string(node, str); ok(strcmp(str, expstr)==0, "Invalid node: %s, exptected %s\n", str, expstr); } -#define expect_list_and_release(list, expstr) { char *str = list_to_string(list); ok(strcmp(str, expstr)==0, "Invalid node list: %s, exptected %s\n", str, expstr); if (list) IXMLDOMNodeList_Release(list); } +#define expect_node(node, expstr) { char str[4096]; node_to_string(node, str); ok(strcmp(str, expstr)==0, "Invalid node: %s, expected %s\n", str, expstr); } +#define expect_list_and_release(list, expstr) { char *str = list_to_string(list); ok(strcmp(str, expstr)==0, "Invalid node list: %s, expected %s\n", str, expstr); if (list) IXMLDOMNodeList_Release(list); } static void test_domdoc( void ) { @@ -1071,6 +1071,7 @@ static void test_domnode( void ) r = IXMLDOMNode_get_ownerDocument( element, &owner ); ok( r == S_OK, "get_ownerDocument return code\n"); ok( owner != doc, "get_ownerDocument return\n"); + IXMLDOMDocument_Release(owner); type = NODE_INVALID; r = IXMLDOMNode_get_nodeType( element, &type);

1 0

Piotr Caban : shlwapi: Fix MLBuildResURLW implementation.
by Alexandre Julliard Jan. 18, 2010

Jan. 18, 2010

Module: wine Branch: master Commit: 147ea8b7c6fb6621fdb4e171d756a9e715262d8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=147ea8b7c6fb6621fdb4e171d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 15 08:18:55 2010 +0100 shlwapi: Fix MLBuildResURLW implementation. --- dlls/shlwapi/url.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index f8a5162..544b529 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -2384,7 +2384,7 @@ HRESULT WINAPI MLBuildResURLW(LPCWSTR lpszLibName, HMODULE hMod, DWORD dwFlags, dwResLen = strlenW(lpszRes) + 1; if (dwDestLen >= dwResLen + 1) { - lpszDest[szResLen + dwPathLen + dwResLen] = '/'; + lpszDest[szResLen + dwPathLen-1] = '/'; memcpy(lpszDest + szResLen + dwPathLen, lpszRes, dwResLen * sizeof(WCHAR)); hRet = S_OK; }

1 0