September 2009 - Wine-Commits

Alexandre Julliard : actxprxy: Add proxies for docobj.idl.
by Alexandre Julliard Sept. 11, 2009

Sept. 11, 2009

Module: wine Branch: master Commit: b957b9afe16e35104f30ae3c4a0c8dc1c9f83c16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b957b9afe16e35104f30ae3c4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 12:33:13 2009 +0200 actxprxy: Add proxies for docobj.idl. --- .gitignore | 2 + dlls/actxprxy/Makefile.in | 1 + dlls/actxprxy/actxprxy_docobj.idl | 21 ++++++++++++++ dlls/actxprxy/usrmarshal.c | 53 +++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 8234ac7..b0018da 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,8 @@ dlls/actxprxy/actxprxy_activscp.h dlls/actxprxy/actxprxy_activscp_p.c dlls/actxprxy/actxprxy_comcat.h dlls/actxprxy/actxprxy_comcat_p.c +dlls/actxprxy/actxprxy_docobj.h +dlls/actxprxy/actxprxy_docobj_p.c dlls/actxprxy/actxprxy_servprov.h dlls/actxprxy/actxprxy_servprov_p.c dlls/advapi32/svcctl.h diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index 4f2d7c3..6aab94f 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -14,6 +14,7 @@ C_SRCS = \ IDL_P_SRCS = \ actxprxy_activscp.idl \ actxprxy_comcat.idl \ + actxprxy_docobj.idl \ actxprxy_servprov.idl @MAKE_DLL_RULES@ diff --git a/dlls/actxprxy/actxprxy_docobj.idl b/dlls/actxprxy/actxprxy_docobj.idl new file mode 100644 index 0000000..711c385 --- /dev/null +++ b/dlls/actxprxy/actxprxy_docobj.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * 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 + */ + +/* just a wrapper for docobj.idl */ + +#include "docobj.idl" diff --git a/dlls/actxprxy/usrmarshal.c b/dlls/actxprxy/usrmarshal.c index 4f888b7..f2aacf8 100644 --- a/dlls/actxprxy/usrmarshal.c +++ b/dlls/actxprxy/usrmarshal.c @@ -33,6 +33,7 @@ #include "objbase.h" #include "servprov.h" #include "comcat.h" +#include "docobj.h" #include "wine/debug.h" @@ -115,3 +116,55 @@ HRESULT __RPC_STUB ICatInformation_IsClassOfCategories_Stub( return ICatInformation_IsClassOfCategories( This, rclsid, cImplemented, rgcatidImpl, cRequired, rgcatidReq ); } + +HRESULT CALLBACK IPrint_Print_Proxy( + IPrint *This, + DWORD grfFlags, + DVTARGETDEVICE **pptd, + PAGESET **ppPageSet, + STGMEDIUM *pstgmOptions, + IContinueCallback *pcallback, + LONG nFirstPage, + LONG *pcPagesPrinted, + LONG *pnLastPage ) +{ + TRACE("(%p)\n", This); + return IPrint_RemotePrint_Proxy( This, grfFlags, pptd, ppPageSet, (RemSTGMEDIUM *)pstgmOptions, + pcallback, nFirstPage, pcPagesPrinted, pnLastPage ); +} + +HRESULT __RPC_STUB IPrint_Print_Stub( + IPrint *This, + DWORD grfFlags, + DVTARGETDEVICE **pptd, + PAGESET **ppPageSet, + RemSTGMEDIUM *pstgmOptions, + IContinueCallback *pcallback, + LONG nFirstPage, + LONG *pcPagesPrinted, + LONG *pnLastPage ) +{ + TRACE("(%p)\n", This); + return IPrint_Print( This, grfFlags, pptd, ppPageSet, (STGMEDIUM *)pstgmOptions, + pcallback, nFirstPage, pcPagesPrinted, pnLastPage ); +} + +HRESULT CALLBACK IEnumOleDocumentViews_Next_Proxy( + IEnumOleDocumentViews *This, + ULONG cViews, + IOleDocumentView **rgpView, + ULONG *pcFetched ) +{ + TRACE("(%p)\n", This); + return IEnumOleDocumentViews_RemoteNext_Proxy( This, cViews, rgpView, pcFetched ); +} + +HRESULT __RPC_STUB IEnumOleDocumentViews_Next_Stub( + IEnumOleDocumentViews *This, + ULONG cViews, + IOleDocumentView **rgpView, + ULONG *pcFetched ) +{ + TRACE("(%p)\n", This); + return IEnumOleDocumentViews_Next( This, cViews, rgpView, pcFetched ); +}

1 0

Alexandre Julliard : actxprxy: Add proxies for comcat.idl.
by Alexandre Julliard Sept. 11, 2009

Sept. 11, 2009

Module: wine Branch: master Commit: 0979be5098dffbb90074a67fb291c4acca533b7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0979be5098dffbb90074a67fb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 12:31:26 2009 +0200 actxprxy: Add proxies for comcat.idl. --- .gitignore | 2 + dlls/actxprxy/Makefile.in | 1 + dlls/actxprxy/actxprxy_comcat.idl | 21 ++++++++++++++ dlls/actxprxy/usrmarshal.c | 53 +++++++++++++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 944a896..8234ac7 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,8 @@ dlls/Makeimplib.rules dlls/Maketest.rules dlls/actxprxy/actxprxy_activscp.h dlls/actxprxy/actxprxy_activscp_p.c +dlls/actxprxy/actxprxy_comcat.h +dlls/actxprxy/actxprxy_comcat_p.c dlls/actxprxy/actxprxy_servprov.h dlls/actxprxy/actxprxy_servprov_p.c dlls/advapi32/svcctl.h diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index da142ae..4f2d7c3 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -13,6 +13,7 @@ C_SRCS = \ IDL_P_SRCS = \ actxprxy_activscp.idl \ + actxprxy_comcat.idl \ actxprxy_servprov.idl @MAKE_DLL_RULES@ diff --git a/dlls/actxprxy/actxprxy_comcat.idl b/dlls/actxprxy/actxprxy_comcat.idl new file mode 100644 index 0000000..6c8155f --- /dev/null +++ b/dlls/actxprxy/actxprxy_comcat.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * 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 + */ + +/* just a wrapper for comcat.idl */ + +#include "comcat.idl" diff --git a/dlls/actxprxy/usrmarshal.c b/dlls/actxprxy/usrmarshal.c index 9d5318f..4f888b7 100644 --- a/dlls/actxprxy/usrmarshal.c +++ b/dlls/actxprxy/usrmarshal.c @@ -32,6 +32,7 @@ #include "winerror.h" #include "objbase.h" #include "servprov.h" +#include "comcat.h" #include "wine/debug.h" @@ -62,3 +63,55 @@ HRESULT __RPC_STUB IServiceProvider_QueryService_Stub( return IServiceProvider_QueryService(This, guidService, riid, (void **)ppvObject); } + +HRESULT CALLBACK ICatInformation_EnumClassesOfCategories_Proxy( + ICatInformation *This, + ULONG cImplemented, + CATID rgcatidImpl[], + ULONG cRequired, + CATID rgcatidReq[], + IEnumCLSID** ppenumClsid ) +{ + TRACE("(%p)\n", This); + return ICatInformation_RemoteEnumClassesOfCategories_Proxy( This, cImplemented, rgcatidImpl, + cRequired, rgcatidReq, ppenumClsid ); +} + +HRESULT __RPC_STUB ICatInformation_EnumClassesOfCategories_Stub( + ICatInformation *This, + ULONG cImplemented, + CATID rgcatidImpl[], + ULONG cRequired, + CATID rgcatidReq[], + IEnumCLSID** ppenumClsid ) +{ + TRACE("(%p)\n", This); + return ICatInformation_EnumClassesOfCategories( This, cImplemented, rgcatidImpl, + cRequired, rgcatidReq, ppenumClsid ); +} + +HRESULT CALLBACK ICatInformation_IsClassOfCategories_Proxy( + ICatInformation *This, + REFCLSID rclsid, + ULONG cImplemented, + CATID rgcatidImpl[], + ULONG cRequired, + CATID rgcatidReq[] ) +{ + TRACE("(%p)\n", This); + return ICatInformation_RemoteIsClassOfCategories_Proxy( This, rclsid, cImplemented, rgcatidImpl, + cRequired, rgcatidReq ); +} + +HRESULT __RPC_STUB ICatInformation_IsClassOfCategories_Stub( + ICatInformation *This, + REFCLSID rclsid, + ULONG cImplemented, + CATID rgcatidImpl[], + ULONG cRequired, + CATID rgcatidReq[] ) +{ + TRACE("(%p)\n", This); + return ICatInformation_IsClassOfCategories( This, rclsid, cImplemented, rgcatidImpl, + cRequired, rgcatidReq ); +}

1 0

Alexandre Julliard : actxprxy: Add proxies for activscp.idl.
by Alexandre Julliard Sept. 11, 2009

Sept. 11, 2009

Module: wine Branch: master Commit: bb9fc3fe5f152a7bd52986c40af48a4d2ef319b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb9fc3fe5f152a7bd52986c40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 11 12:28:31 2009 +0200 actxprxy: Add proxies for activscp.idl. --- .gitignore | 3 ++- dlls/actxprxy/Makefile.in | 8 +++----- dlls/actxprxy/actxprxy_activscp.idl | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 359f44e..944a896 100644 --- a/.gitignore +++ b/.gitignore @@ -21,8 +21,9 @@ dlls/*/tests/testlist.c dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules +dlls/actxprxy/actxprxy_activscp.h +dlls/actxprxy/actxprxy_activscp_p.c dlls/actxprxy/actxprxy_servprov.h -dlls/actxprxy/actxprxy_servprov_i.c dlls/actxprxy/actxprxy_servprov_p.c dlls/advapi32/svcctl.h dlls/advapi32/svcctl_c.c diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in index 005ec0f..da142ae 100644 --- a/dlls/actxprxy/Makefile.in +++ b/dlls/actxprxy/Makefile.in @@ -3,18 +3,16 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = actxprxy.dll -IMPORTS = rpcrt4 kernel32 ntdll -EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_CLSID_IS="{ 0xb8da6310, 0xe19b, 0x11d0, { 0x93, 0x3c, 0x00, 0xa0, 0xc9, 0x0d, 0xca, 0xa9 } }" +IMPORTS = uuid oleaut32 ole32 rpcrt4 kernel32 ntdll +EXTRADEFS = -DREGISTER_PROXY_DLL -DPROXY_DELEGATION EXTRA_OBJS = dlldata.o C_SRCS = \ usrmarshal.c -IDL_I_SRCS = \ - actxprxy_servprov.idl - IDL_P_SRCS = \ + actxprxy_activscp.idl \ actxprxy_servprov.idl @MAKE_DLL_RULES@ diff --git a/dlls/actxprxy/actxprxy_activscp.idl b/dlls/actxprxy/actxprxy_activscp.idl new file mode 100644 index 0000000..c056a0e --- /dev/null +++ b/dlls/actxprxy/actxprxy_activscp.idl @@ -0,0 +1,21 @@ +/* + * Copyright 2009 Alexandre Julliard + * + * 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 + */ + +/* just a wrapper for activscp.idl */ + +#include "activscp.idl"

1 0

Dmitry Timoshkov : ntdll: RtlpNtQueryValueKey takes 5 parameters.
by Alexandre Julliard Sept. 11, 2009

Sept. 11, 2009

Module: wine Branch: master Commit: 049bbe3f12270ae2b8aee627a71e1bc35478796a URL: http://source.winehq.org/git/wine.git/?a=commit;h=049bbe3f12270ae2b8aee627a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Sep 11 15:08:22 2009 +0900 ntdll: RtlpNtQueryValueKey takes 5 parameters. --- dlls/ntdll/reg.c | 2 +- dlls/ntdll/tests/reg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index d586ce3..f9db5a6 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -530,7 +530,7 @@ NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, * */ NTSTATUS WINAPI RtlpNtQueryValueKey( HANDLE handle, ULONG *result_type, PBYTE dest, - DWORD *result_len ) + DWORD *result_len, void *unknown ) { KEY_VALUE_PARTIAL_INFORMATION *info; UNICODE_STRING name; diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 730f818..89f7c68 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -140,7 +140,7 @@ static NTSTATUS (WINAPI * pRtlUnicodeStringToAnsiString)(PSTRING, PUNICODE_STRIN static NTSTATUS (WINAPI * pRtlFreeHeap)(PVOID, ULONG, PVOID); static LPVOID (WINAPI * pRtlAllocateHeap)(PVOID,ULONG,ULONG); static NTSTATUS (WINAPI * pRtlZeroMemory)(PVOID, ULONG); -static NTSTATUS (WINAPI * pRtlpNtQueryValueKey)(HANDLE,ULONG*,PBYTE,DWORD*); +static NTSTATUS (WINAPI * pRtlpNtQueryValueKey)(HANDLE,ULONG*,PBYTE,DWORD*,void *); static HMODULE hntdll = 0; static int CurrentTest = 0; @@ -593,7 +593,7 @@ static void test_RtlpNtQueryValueKey(void) { NTSTATUS status; - status = pRtlpNtQueryValueKey(NULL, NULL, NULL, NULL); + status = pRtlpNtQueryValueKey(NULL, NULL, NULL, NULL, NULL); ok(status == STATUS_INVALID_HANDLE, "Expected STATUS_INVALID_HANDLE, got: 0x%08x\n", status); }

1 0

Vitaliy Margolen : dinput: Fix POV for programs that use buffered events.
by Alexandre Julliard Sept. 11, 2009

Sept. 11, 2009

Module: wine Branch: master Commit: 8c279bb80b5331bda20f8756cc6aac821a58c70a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c279bb80b5331bda20f8756c… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Sep 10 23:03:47 2009 -0600 dinput: Fix POV for programs that use buffered events. --- dlls/dinput/joystick_linux.c | 3 ++- dlls/dinput/joystick_linuxinput.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index bf31eaf..2203a20 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -582,7 +582,8 @@ static void joy_polldev(JoystickGenericImpl *This_in) { int number = This->generic.axis_map[jse.number]; /* wine format object index */ if (number < 0) return; - inst_id = DIDFT_MAKEINSTANCE(number) | (number < 8 ? DIDFT_ABSAXIS : DIDFT_POV); + inst_id = number < 8 ? DIDFT_MAKEINSTANCE(number) | DIDFT_ABSAXIS : + DIDFT_MAKEINSTANCE(number - 8) | DIDFT_POV; value = joystick_map_axis(&This->generic.props[id_to_object(This->generic.base.data_format.wine_df, inst_id)], jse.value); TRACE("changing axis %d => %d\n", jse.number, number); diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 42daaeb..67a1ee3 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -779,7 +779,8 @@ static void joy_polldev(JoystickGenericImpl *iface) axis = This->generic.axis_map[axis]; if (axis < 0) break; - inst_id = DIDFT_MAKEINSTANCE(axis) | (axis < 8 ? DIDFT_ABSAXIS : DIDFT_POV); + inst_id = axis < 8 ? DIDFT_MAKEINSTANCE(axis) | DIDFT_ABSAXIS : + DIDFT_MAKEINSTANCE(axis - 8) | DIDFT_POV; value = joystick_map_axis(&This->generic.props[id_to_object(This->generic.base.data_format.wine_df, inst_id)], ie.value); switch (axis) {

1 0

Chris Robinson : openal32: Downgrade two FIXMEs to WARNs, since they test app-specified parameters.
by Alexandre Julliard Sept. 11, 2009

Sept. 11, 2009

Module: wine Branch: master Commit: fd74347241a38df2a9054f1de4fb258be6b03634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd74347241a38df2a9054f1de… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Thu Sep 10 12:13:24 2009 -0700 openal32: Downgrade two FIXMEs to WARNs, since they test app-specified parameters. --- dlls/openal32/openal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index e4da15b..792a870 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -175,7 +175,7 @@ ALCboolean CDECL wine_alcMakeContextCurrent(ALCcontext *context) EnterCriticalSection(&openal_cs); if(context && !(ctx=ValidateCtx(context))) - FIXME("Could not find context %p in context list\n", context); + WARN("Could not find context %p in context list\n", context); if(alcMakeContextCurrent(context) == ALC_FALSE) { @@ -252,7 +252,7 @@ ALvoid CDECL wine_alcDestroyContext(ALCcontext *context) if(!(*list)) { - FIXME("Could not find context %p in context list\n", context); + WARN("Could not find context %p in context list\n", context); alcDestroyContext(context); LeaveCriticalSection(&openal_cs); return;

1 0

Chris Robinson : openal32: Pass invalid contexts to the host OpenAL lib so it can set the proper error state .
by Alexandre Julliard Sept. 11, 2009

Sept. 11, 2009

Module: wine Branch: master Commit: 19bc84c86dacf0b6a0ec802a9b27ff940f7afc17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19bc84c86dacf0b6a0ec802a9… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Thu Sep 10 12:12:08 2009 -0700 openal32: Pass invalid contexts to the host OpenAL lib so it can set the proper error state. --- dlls/openal32/openal.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/openal32/openal.c b/dlls/openal32/openal.c index 75654fc..e4da15b 100644 --- a/dlls/openal32/openal.c +++ b/dlls/openal32/openal.c @@ -175,15 +175,11 @@ ALCboolean CDECL wine_alcMakeContextCurrent(ALCcontext *context) EnterCriticalSection(&openal_cs); if(context && !(ctx=ValidateCtx(context))) - { FIXME("Could not find context %p in context list\n", context); - LeaveCriticalSection(&openal_cs); - return ALC_FALSE; - } - if(alcMakeContextCurrent(ctx ? ctx->ctx : NULL) == ALC_FALSE) + if(alcMakeContextCurrent(context) == ALC_FALSE) { - WARN("Failed to make context %p current\n", ctx->ctx); + WARN("Failed to make context %p current\n", context); LeaveCriticalSection(&openal_cs); return ALC_FALSE; } @@ -257,6 +253,7 @@ ALvoid CDECL wine_alcDestroyContext(ALCcontext *context) if(!(*list)) { FIXME("Could not find context %p in context list\n", context); + alcDestroyContext(context); LeaveCriticalSection(&openal_cs); return; }

1 0

Nikolay Sivov : include: Move some definitions to public header, use PSDK names.
by Alexandre Julliard Sept. 11, 2009

Sept. 11, 2009

Module: wine Branch: master Commit: 3b6ac3000f05d749501137a2b055dbf3464fb31c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b6ac3000f05d749501137a2b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 10 23:45:56 2009 +0400 include: Move some definitions to public header, use PSDK names. --- dlls/comctl32/dpa.c | 45 ++++++++++++++++++--------------------------- dlls/comctl32/tests/dpa.c | 24 ++++++++---------------- include/commctrl.h | 13 +++++++++++++ 3 files changed, 39 insertions(+), 43 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index def2e95..f9c8afc 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -61,15 +61,6 @@ typedef struct _STREAMDATA DWORD dwItems; } STREAMDATA, *PSTREAMDATA; -typedef struct _LOADDATA -{ - INT nCount; - PVOID ptr; -} LOADDATA, *LPLOADDATA; - -typedef HRESULT (CALLBACK *DPALOADPROC)(LPLOADDATA,IStream*,LPARAM); - - /************************************************************************** * DPA_LoadStream [COMCTL32.9] * @@ -79,29 +70,29 @@ typedef HRESULT (CALLBACK *DPALOADPROC)(LPLOADDATA,IStream*,LPARAM); * phDpa [O] pointer to a handle to a dynamic pointer array * loadProc [I] pointer to a callback function * pStream [I] pointer to a stream - * lParam [I] application specific value + * pData [I] pointer to callback data * * RETURNS * Success: TRUE - * Failure: FALSE + * Failure: FALSE * * NOTES * No more information available yet! */ -HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, DPALOADPROC loadProc, - IStream *pStream, LPARAM lParam) +HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, PFNDPASTREAM loadProc, + IStream *pStream, LPVOID pData) { HRESULT errCode; LARGE_INTEGER position; ULARGE_INTEGER newPosition; STREAMDATA streamData; - LOADDATA loadData; + DPASTREAMINFO streamInfo; ULONG ulRead; HDPA hDpa; PVOID *ptr; - FIXME ("phDpa=%p loadProc=%p pStream=%p lParam=%lx\n", - phDpa, loadProc, pStream, lParam); + FIXME ("phDpa=%p loadProc=%p pStream=%p pData=%p\n", + phDpa, loadProc, pStream, pData); if (!phDpa || !loadProc || !pStream) return E_INVALIDARG; @@ -127,7 +118,7 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, DPALOADPROC loadProc, streamData.dwSize, streamData.dwData2, streamData.dwItems); if ( ulRead < sizeof(STREAMDATA) || - lParam < sizeof(STREAMDATA) || + (DWORD)pData < sizeof(STREAMDATA) || streamData.dwSize < sizeof(STREAMDATA) || streamData.dwData2 < 1) { errCode = E_FAIL; @@ -146,19 +137,19 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, DPALOADPROC loadProc, /* load data from the stream into the dpa */ ptr = hDpa->ptrs; - for (loadData.nCount = 0; loadData.nCount < streamData.dwItems; loadData.nCount++) { - errCode = (loadProc)(&loadData, pStream, lParam); + for (streamInfo.iPos = 0; streamInfo.iPos < streamData.dwItems; streamInfo.iPos++) { + errCode = (loadProc)(&streamInfo, pStream, pData); if (errCode != S_OK) { errCode = S_FALSE; break; } - *ptr = loadData.ptr; + *ptr = streamInfo.pvItem; ptr++; } /* set the number of items */ - hDpa->nItemCount = loadData.nCount; + hDpa->nItemCount = streamInfo.iPos; /* store the handle to the dpa */ *phDpa = hDpa; @@ -177,21 +168,21 @@ HRESULT WINAPI DPA_LoadStream (HDPA *phDpa, DPALOADPROC loadProc, * hDpa [I] handle to a dynamic pointer array * loadProc [I] pointer to a callback function * pStream [I] pointer to a stream - * lParam [I] application specific value + * pData [I] pointer to callback data * * RETURNS * Success: TRUE - * Failure: FALSE + * Failure: FALSE * * NOTES * No more information available yet! */ -HRESULT WINAPI DPA_SaveStream (const HDPA hDpa, DPALOADPROC loadProc, - IStream *pStream, LPARAM lParam) +HRESULT WINAPI DPA_SaveStream (const HDPA hDpa, PFNDPASTREAM loadProc, + IStream *pStream, LPVOID pData) { - FIXME ("hDpa=%p loadProc=%p pStream=%p lParam=%lx\n", - hDpa, loadProc, pStream, lParam); + FIXME ("hDpa=%p loadProc=%p pStream=%p pData=%p\n", + hDpa, loadProc, pStream, pData); return E_FAIL; } diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index d7de377..e9a1fa5 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -33,14 +33,6 @@ #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) -typedef struct _ITEMDATA -{ - INT iPos; - PVOID pvData; -} ITEMDATA, *LPITEMDATA; - -typedef HRESULT (CALLBACK *PFNDPASTM)(LPITEMDATA,IStream*,LPARAM); - static HDPA (WINAPI *pDPA_Clone)(const HDPA,const HDPA); static HDPA (WINAPI *pDPA_Create)(INT); static HDPA (WINAPI *pDPA_CreateEx)(INT,HANDLE); @@ -53,9 +45,9 @@ static INT (WINAPI *pDPA_GetPtr)(const HDPA,INT); static INT (WINAPI *pDPA_GetPtrIndex)(const HDPA,PVOID); static BOOL (WINAPI *pDPA_Grow)(HDPA,INT); static INT (WINAPI *pDPA_InsertPtr)(const HDPA,INT,PVOID); -static HRESULT (WINAPI *pDPA_LoadStream)(HDPA*,PFNDPASTM,IStream*,LPARAM); +static HRESULT (WINAPI *pDPA_LoadStream)(HDPA*,PFNDPASTREAM,IStream*,LPARAM); static BOOL (WINAPI *pDPA_Merge)(const HDPA,const HDPA,DWORD,PFNDPACOMPARE,PFNDPAMERGE,LPARAM); -static HRESULT (WINAPI *pDPA_SaveStream)(HDPA,PFNDPASTM,IStream*,LPARAM); +static HRESULT (WINAPI *pDPA_SaveStream)(HDPA,PFNDPASTREAM,IStream*,LPARAM); static INT (WINAPI *pDPA_Search)(HDPA,PVOID,INT,PFNDPACOMPARE,LPARAM,UINT); static BOOL (WINAPI *pDPA_SetPtr)(const HDPA,INT,PVOID); static BOOL (WINAPI *pDPA_Sort)(const HDPA,PFNDPACOMPARE,LPARAM); @@ -140,29 +132,29 @@ static INT CALLBACK CB_EnumFirstThree(PVOID pItem, PVOID lp) return pItem != (PVOID)3; } -static HRESULT CALLBACK CB_Save(LPITEMDATA pInfo, IStream *pStm, LPARAM lp) +static HRESULT CALLBACK CB_Save(DPASTREAMINFO *pInfo, IStream *pStm, LPVOID lp) { HRESULT hRes; - ok(lp == 0xdeadbeef, "lp=%ld\n", lp); + ok(lp == (LPVOID)0xdeadbeef, "lp=%p\n", lp); hRes = IStream_Write(pStm, &pInfo->iPos, sizeof(INT), NULL); ok(hRes == S_OK, "hRes=0x%x\n", hRes); - hRes = IStream_Write(pStm, &pInfo->pvData, sizeof(PVOID), NULL); + hRes = IStream_Write(pStm, &pInfo->pvItem, sizeof(PVOID), NULL); ok(hRes == S_OK, "hRes=0x%x\n", hRes); return S_OK; } -static HRESULT CALLBACK CB_Load(LPITEMDATA pInfo, IStream *pStm, LPARAM lp) +static HRESULT CALLBACK CB_Load(DPASTREAMINFO *pInfo, IStream *pStm, LPVOID lp) { HRESULT hRes; INT iOldPos; iOldPos = pInfo->iPos; - ok(lp == 0xdeadbeef, "lp=%ld\n", lp); + ok(lp == (LPVOID)0xdeadbeef, "lp=%p\n", lp); hRes = IStream_Read(pStm, &pInfo->iPos, sizeof(INT), NULL); ok(hRes == S_OK, "hRes=0x%x\n", hRes); ok(pInfo->iPos == iOldPos, "iPos=%d iOldPos=%d\n", pInfo->iPos, iOldPos); - hRes = IStream_Read(pStm, &pInfo->pvData, sizeof(PVOID), NULL); + hRes = IStream_Read(pStm, &pInfo->pvItem, sizeof(PVOID), NULL); ok(hRes == S_OK, "hRes=0x%x\n", hRes); return S_OK; } diff --git a/include/commctrl.h b/include/commctrl.h index 55cae1c..bda13de 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5011,6 +5011,19 @@ void WINAPI DPA_DestroyCallback(HDPA, PFNDPAENUMCALLBACK, LPVOID); INT WINAPI DPA_Search(HDPA, LPVOID, INT, PFNDPACOMPARE, LPARAM, UINT); BOOL WINAPI DPA_Merge(HDPA, HDPA, DWORD, PFNDPACOMPARE, PFNDPAMERGE, LPARAM); +/* save/load from stream */ +typedef struct _DPASTREAMINFO +{ + INT iPos; /* item index */ + LPVOID pvItem; +} DPASTREAMINFO; + +struct IStream; +typedef HRESULT (CALLBACK *PFNDPASTREAM)(DPASTREAMINFO*, struct IStream*, LPVOID); + +HRESULT WINAPI DPA_LoadStream(HDPA*, PFNDPASTREAM, struct IStream*, LPVOID); +HRESULT WINAPI DPA_SaveStream(HDPA, PFNDPASTREAM, struct IStream*, LPVOID); + BOOL WINAPI Str_SetPtrW (LPWSTR *, LPCWSTR); /**************************************************************************

1 0

Nikolay Sivov : comctl32/dpa: Fix DPA_Merge() for DPAM_INTERSECT option.
by Alexandre Julliard Sept. 11, 2009

Sept. 11, 2009

Module: wine Branch: master Commit: 7044ac87512fb91287a96c3033c46fe6db873f26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7044ac87512fb91287a96c303… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 10 22:56:56 2009 +0400 comctl32/dpa: Fix DPA_Merge() for DPAM_INTERSECT option. --- dlls/comctl32/dpa.c | 2 +- dlls/comctl32/tests/dpa.c | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index 9a4883a..def2e95 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -311,7 +311,7 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, /* Now delete the extra item in DPA1 */ PVOID ptr; - ptr = DPA_DeletePtr (hdpa1, hdpa1->nItemCount - 1); + ptr = DPA_DeletePtr (hdpa1, nIndex); (pfnMerge)(DPAMM_DELETE, ptr, NULL, lParam); } diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 5d16c67..d7de377 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -396,11 +396,9 @@ static void test_DPA_Merge(void) memset(nMessages, 0, sizeof(nMessages)); pDPA_Merge(dpa2, dpa, DPAM_INTERSECT, CB_CmpLT, CB_MergeDeleteOddSrc, 0xdeadbeef); - todo_wine - { - rc = CheckDPA(dpa2, 0x246, &dw); - ok(rc, "dw=0x%x\n", dw); - } + rc = CheckDPA(dpa2, 0x246, &dw); + ok(rc, "dw=0x%x\n", dw); + expect(3, nMessages[DPAMM_MERGE]); expect(3, nMessages[DPAMM_DELETE]); expect(0, nMessages[DPAMM_INSERT]); @@ -415,11 +413,9 @@ static void test_DPA_Merge(void) memset(nMessages, 0, sizeof(nMessages)); pDPA_Merge(dpa2, dpa, DPAM_INTERSECT, CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); - todo_wine - { - rc = CheckDPA(dpa2, 0x135, &dw); - ok(rc, "dw=0x%x\n", dw); - } + rc = CheckDPA(dpa2, 0x135, &dw); + ok(rc, "dw=0x%x\n", dw); + expect(3, nMessages[DPAMM_MERGE]); expect(6, nMessages[DPAMM_DELETE]); expect(0, nMessages[DPAMM_INSERT]);

1 0

Nikolay Sivov : comctl32/dpa: Some DPA_Merge tests.
by Alexandre Julliard Sept. 11, 2009

Sept. 11, 2009

Module: wine Branch: master Commit: e97fcdd1bbede2a33bd805b91bf50a6f7a4e9634 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e97fcdd1bbede2a33bd805b91… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Sep 10 22:17:09 2009 +0400 comctl32/dpa: Some DPA_Merge tests. --- dlls/comctl32/tests/dpa.c | 68 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 68 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/dpa.c b/dlls/comctl32/tests/dpa.c index 7d907cf..5d16c67 100644 --- a/dlls/comctl32/tests/dpa.c +++ b/dlls/comctl32/tests/dpa.c @@ -31,6 +31,8 @@ #include "wine/test.h" +#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) + typedef struct _ITEMDATA { INT iPos; @@ -105,14 +107,22 @@ static INT CALLBACK CB_CmpGT(PVOID p1, PVOID p2, LPARAM lp) return p1 > p2 ? -1 : p1 < p2 ? 1 : 0; } +/* merge callback messages counter + DPAMM_MERGE 1 + DPAMM_DELETE 2 + DPAMM_INSERT 3 */ +static INT nMessages[4]; + static PVOID CALLBACK CB_MergeInsertSrc(UINT op, PVOID p1, PVOID p2, LPARAM lp) { + nMessages[op]++; ok(lp == 0xdeadbeef, "lp=%ld\n", lp); return p1; } static PVOID CALLBACK CB_MergeDeleteOddSrc(UINT op, PVOID p1, PVOID p2, LPARAM lp) { + nMessages[op]++; ok(lp == 0xdeadbeef, "lp=%ld\n", lp); return ((PCHAR)p2)+1; } @@ -383,6 +393,7 @@ static void test_DPA_Merge(void) ok(rc, "dw=0x%x\n", dw); /* Delete all odd entries from dpa2 */ + memset(nMessages, 0, sizeof(nMessages)); pDPA_Merge(dpa2, dpa, DPAM_INTERSECT, CB_CmpLT, CB_MergeDeleteOddSrc, 0xdeadbeef); todo_wine @@ -390,12 +401,69 @@ static void test_DPA_Merge(void) rc = CheckDPA(dpa2, 0x246, &dw); ok(rc, "dw=0x%x\n", dw); } + expect(3, nMessages[DPAMM_MERGE]); + expect(3, nMessages[DPAMM_DELETE]); + expect(0, nMessages[DPAMM_INSERT]); + + for (i = 0; i < 6; i++) + { + ret = pDPA_InsertPtr(dpa2, i, (PVOID)(6-i)); + ok(ret == i, "ret=%d\n", ret); + } + + /* DPAM_INTERSECT - returning source while merging */ + memset(nMessages, 0, sizeof(nMessages)); + pDPA_Merge(dpa2, dpa, DPAM_INTERSECT, + CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); + todo_wine + { + rc = CheckDPA(dpa2, 0x135, &dw); + ok(rc, "dw=0x%x\n", dw); + } + expect(3, nMessages[DPAMM_MERGE]); + expect(6, nMessages[DPAMM_DELETE]); + expect(0, nMessages[DPAMM_INSERT]); + + /* DPAM_UNION */ + pDPA_DeleteAllPtrs(dpa); + pDPA_InsertPtr(dpa, 0, (PVOID)1); + pDPA_InsertPtr(dpa, 1, (PVOID)3); + pDPA_InsertPtr(dpa, 2, (PVOID)5); + pDPA_DeleteAllPtrs(dpa2); + pDPA_InsertPtr(dpa2, 0, (PVOID)2); + pDPA_InsertPtr(dpa2, 1, (PVOID)4); + pDPA_InsertPtr(dpa2, 2, (PVOID)6); + + memset(nMessages, 0, sizeof(nMessages)); + pDPA_Merge(dpa2, dpa, DPAM_UNION, + CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); + rc = CheckDPA(dpa2, 0x123456, &dw); + ok(rc, "dw=0x%x\n", dw); + + expect(0, nMessages[DPAMM_MERGE]); + expect(0, nMessages[DPAMM_DELETE]); + expect(3, nMessages[DPAMM_INSERT]); /* Merge dpa3 into dpa2 and dpa */ + memset(nMessages, 0, sizeof(nMessages)); pDPA_Merge(dpa, dpa3, DPAM_UNION|DPAM_SORTED, CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); + expect(3, nMessages[DPAMM_MERGE]); + expect(0, nMessages[DPAMM_DELETE]); + expect(3, nMessages[DPAMM_INSERT]); + + + pDPA_DeleteAllPtrs(dpa2); + pDPA_InsertPtr(dpa2, 0, (PVOID)2); + pDPA_InsertPtr(dpa2, 1, (PVOID)4); + pDPA_InsertPtr(dpa2, 2, (PVOID)6); + + memset(nMessages, 0, sizeof(nMessages)); pDPA_Merge(dpa2, dpa3, DPAM_UNION|DPAM_SORTED, CB_CmpLT, CB_MergeInsertSrc, 0xdeadbeef); + expect(3, nMessages[DPAMM_MERGE]); + expect(0, nMessages[DPAMM_DELETE]); + expect(3, nMessages[DPAMM_INSERT]); rc = CheckDPA(dpa, 0x123456, &dw); ok(rc, "dw=0x%x\n", dw);

1 0