December 2005 - Wine-commits

Eric Pouech : vidc: Return error codes when a message isn't supported.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: ed43709a385ff99f1e407e9c2b87acc5125720f5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed43709a385ff99f1e407e9… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Mon Dec 12 11:53:28 2005 +0100 vidc: Return error codes when a message isn't supported. --- dlls/iccvid/iccvid.c | 3 +-- dlls/msvidc32/msvideo1.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/iccvid/iccvid.c b/dlls/iccvid/iccvid.c index ad04d5f..009c4ae 100644 --- a/dlls/iccvid/iccvid.c +++ b/dlls/iccvid/iccvid.c @@ -978,14 +978,13 @@ LRESULT WINAPI ICCVID_DriverProc( DWORD_ case ICM_DECOMPRESSEX: return ICCVID_DecompressEx( info, (ICDECOMPRESSEX*) lParam1, (DWORD) lParam2 ); - case DRV_CLOSE: return ICCVID_Close( info ); default: FIXME("Unknown message: %04x %ld %ld\n", msg, lParam1, lParam2); } - return 0; + return ICERR_UNSUPPORTED; } BOOL WINAPI DllMain(HINSTANCE hModule, DWORD dwReason, LPVOID lpReserved) diff --git a/dlls/msvidc32/msvideo1.c b/dlls/msvidc32/msvideo1.c index f971d4f..0a79139 100644 --- a/dlls/msvidc32/msvideo1.c +++ b/dlls/msvidc32/msvideo1.c @@ -482,7 +482,7 @@ LRESULT WINAPI CRAM_DriverProc( DWORD_PT LPARAM lParam1, LPARAM lParam2 ) { Msvideo1Context *info = (Msvideo1Context *) dwDriverId; - LRESULT r = 0; + LRESULT r = ICERR_UNSUPPORTED; TRACE("%ld %p %04x %08lx %08lx\n", dwDriverId, hdrvr, msg, lParam1, lParam2);

1 0

Robert Shearman : OLE: Fix SafeArrayCopy for NULL pvData.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 9f1c6bf6bce0c2be5dcb236b5ff7a1daded2892d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9f1c6bf6bce0c2be5dcb236… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 11:52:51 2005 +0100 OLE: Fix SafeArrayCopy for NULL pvData. It is allowed to copy a SAFEARRAY with a NULL pvData, as long as cbElements is non-zero. Add a test for this and fix the safe array code. --- dlls/oleaut32/safearray.c | 10 +++++++++- dlls/oleaut32/tests/safearray.c | 15 ++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index b84226b..4ff056a 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -355,7 +355,9 @@ static HRESULT SAFEARRAY_DestroyData(SAF /* Copy data items from one array to another */ static HRESULT SAFEARRAY_CopyData(SAFEARRAY *psa, SAFEARRAY *dest) { - if (!psa->pvData || !dest->pvData || psa->fFeatures & FADF_DATADELETED) + if (!psa->pvData) + return S_OK; + else if (!dest->pvData || psa->fFeatures & FADF_DATADELETED) return E_INVALIDARG; else { @@ -1378,6 +1380,12 @@ HRESULT WINAPI SafeArrayCopy(SAFEARRAY * if (!psa) return S_OK; /* Handles copying of NULL arrays */ + if (!psa->cbElements) + { + ERR("not copying an array of 0 elements\n"); + return E_INVALIDARG; + } + if (psa->fFeatures & (FADF_RECORD|FADF_HAVEIID|FADF_HAVEVARTYPE)) { VARTYPE vt; diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index a39d43a..d7909e7 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -1418,7 +1418,7 @@ static void test_SafeArrayClear(void) static void test_SafeArrayCopy(void) { SAFEARRAYBOUND sab; - SAFEARRAY *sa; + SAFEARRAY *sa, *sa2; VARIANTARG vSrc, vDst; HRESULT hres; @@ -1450,6 +1450,19 @@ static void test_SafeArrayCopy(void) SafeArrayDestroy(V_ARRAY(&vSrc)); SafeArrayDestroy(V_ARRAY(&vDst)); + + hres = SafeArrayAllocDescriptor(1, &sa); + ok(hres == S_OK, "SafeArrayAllocDescriptor failed with error 0x%08lx\n", hres); + + hres = SafeArrayCopy(sa, &sa2); + ok(hres == E_INVALIDARG, + "SafeArrayCopy with empty array should have failed with error E_INVALIDARG instead of 0x%08lx\n", + hres); + sa->cbElements = 16; + hres = SafeArrayCopy(sa, &sa2); + ok(hres == S_OK, "SafeArrayCopy failed with error 0x%08lx\n", hres); + + SafeArrayDestroy(sa); } #define MKARRAY(low,num,typ) sab.lLbound = low; sab.cElements = num; \

1 0

Robert Shearman : CreateErrorInfo trace fix.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 6c3e1f9adfe687184b4eb5e7890a57399d8b3c9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6c3e1f9adfe687184b4eb5e… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 11:52:36 2005 +0100 CreateErrorInfo trace fix. CreateErrorInfo isn't a stub so don't print this in the trace message. --- dlls/ole32/errorinfo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index 730f0d8..7404c6c 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -476,7 +476,7 @@ HRESULT WINAPI CreateErrorInfo(ICreateEr { IErrorInfo * pei; HRESULT res; - TRACE("(%p): stub:\n", pperrinfo); + TRACE("(%p)\n", pperrinfo); if(! pperrinfo ) return E_INVALIDARG; if(!(pei=IErrorInfoImpl_Constructor()))return E_OUTOFMEMORY;

1 0

Robert Shearman : OLE: Add const to several typelib functions.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 69aa9f9d2e5347c4fe81959bcee3891d0ca5c5d6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=69aa9f9d2e5347c4fe81959… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 11:52:23 2005 +0100 OLE: Add const to several typelib functions. Add const attributes to parameters for several functions and fix up some formatting. --- dlls/oleaut32/typelib.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index a6e2495..29585a3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -85,7 +85,7 @@ WINE_DECLARE_DEBUG_CHANNEL(typelib); /* The OLE Automation ProxyStub Interface Class (aka Typelib Marshaler) */ const GUID CLSID_PSOAInterface = { 0x00020424, 0, 0, { 0xC0, 0, 0, 0, 0, 0, 0, 0x46 } }; -static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, TYPEDESC *tdesc, VARTYPE *vt); +static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt); static HRESULT TLB_AllocAndInitVarDesc(const VARDESC *src, VARDESC **dest_ptr); /**************************************************************************** @@ -5054,7 +5054,7 @@ _copy_arg( ITypeInfo2 *tinfo, TYPEDESC * return E_FAIL; } -static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, TYPEDESC *tdesc, VARTYPE *vt) +static HRESULT userdefined_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) { HRESULT hr = S_OK; ITypeInfo *tinfo2 = NULL; @@ -5088,11 +5088,11 @@ static HRESULT userdefined_to_variantvt( break; case TKIND_INTERFACE: - if (IsEqualIID(&IID_IDispatch, &tattr->guid)) - *vt |= VT_DISPATCH; - else - *vt |= VT_UNKNOWN; - break; + if (IsEqualIID(&IID_IDispatch, &tattr->guid)) + *vt |= VT_DISPATCH; + else + *vt |= VT_UNKNOWN; + break; case TKIND_DISPATCH: *vt |= VT_DISPATCH; @@ -5118,7 +5118,7 @@ static HRESULT userdefined_to_variantvt( return hr; } -static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, TYPEDESC *tdesc, VARTYPE *vt) +static HRESULT typedescvt_to_variantvt(ITypeInfo *tinfo, const TYPEDESC *tdesc, VARTYPE *vt) { HRESULT hr = S_OK; @@ -5134,7 +5134,7 @@ static HRESULT typedescvt_to_variantvt(I ((tdesc->vt == VT_PTR) && (tdesc->u.lptdesc->vt == VT_USERDEFINED))) { VARTYPE vt_userdefined = 0; - TYPEDESC *tdesc_userdefined = tdesc; + const TYPEDESC *tdesc_userdefined = tdesc; if (tdesc->vt == VT_PTR) { vt_userdefined = VT_BYREF;

1 0

Jacek Caban : mshtml: Added IHTMLDocument3 stub implementation.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 7f7e94d331481a381dc4c188240c9b235548cde8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7f7e94d331481a381dc4c18… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 12 11:51:43 2005 +0100 mshtml: Added IHTMLDocument3 stub implementation. --- dlls/mshtml/Makefile.in | 1 dlls/mshtml/htmldoc.c | 4 dlls/mshtml/htmldoc3.c | 448 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 4 files changed, 456 insertions(+), 0 deletions(-) create mode 100644 dlls/mshtml/htmldoc3.c

1 0

Robert Shearman : OleTranslateColor trace fix.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: e7299cdf47a5588a0e7357403b08d18da61d0bdb URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e7299cdf47a5588a0e73574… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 11:52:02 2005 +0100 OleTranslateColor trace fix. OleTranslateColor isn't a stub so don't print ":stub" in the trace message. --- dlls/oleaut32/oleaut.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 3ef2088..bedca34 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -629,7 +629,7 @@ HRESULT WINAPI OleTranslateColor( COLORREF colorref; BYTE b = HIBYTE(HIWORD(clr)); - TRACE("(%08lx, %p, %p):stub\n", clr, hpal, pColorRef); + TRACE("(%08lx, %p, %p)\n", clr, hpal, pColorRef); /* * In case pColorRef is NULL, provide our own to simplify the code.

1 0

Robert Shearman : widl: Don't output __RPC_FAR in generated code.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: fea330364bbf4109e3465d2ee0cca84b6ff34400 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fea330364bbf4109e3465d2… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Dec 12 11:51:11 2005 +0100 widl: Don't output __RPC_FAR in generated code. --- tools/widl/client.c | 10 +++++----- tools/widl/server.c | 6 +++--- tools/widl/typegen.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index a371be6..6c33692 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -153,9 +153,9 @@ static void write_function_stubs(type_t print_client("NdrSendReceive(\n"); indent++; print_client("(PMIDL_STUB_MESSAGE)&_StubMsg,\n"); - print_client("(unsigned char __RPC_FAR *)_StubMsg.Buffer);\n"); - /* print_client("(unsigned char __RPC_FAR *)_StubMsg.Buffer,\n"); */ - /* print_client("(RPC_BINDING_HANDLE __RPC_FAR *) &%s__MIDL_AutoBindHandle);\n", iface->name); */ + print_client("(unsigned char *)_StubMsg.Buffer);\n"); + /* print_client("(unsigned char *)_StubMsg.Buffer,\n"); */ + /* print_client("(RPC_BINDING_HANDLE *) &%s__MIDL_AutoBindHandle);\n", iface->name); */ indent--; /* unmarshal return value */ @@ -174,7 +174,7 @@ static void write_function_stubs(type_t print_client("_RetVal = *(("); write_type(client, def->type, def, def->tname); - fprintf(client, " __RPC_FAR *)_StubMsg.Buffer)++;\n"); + fprintf(client, " *)_StubMsg.Buffer)++;\n"); } /* update proc_offset */ @@ -244,7 +244,7 @@ static void write_stubdescriptor(type_t print_client("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); print_client("{\n"); indent++; - print_client("(void __RPC_FAR *)& %s___RpcClientInterface,\n", iface->name); + print_client("(void *)& %s___RpcClientInterface,\n", iface->name); print_client("MIDL_user_allocate,\n"); print_client("MIDL_user_free,\n"); if (implicit_handle) diff --git a/tools/widl/server.c b/tools/widl/server.c index 4009bb2..668e492 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -216,12 +216,12 @@ static void write_function_stubs(type_t print_server("RpcRaiseException(_Status);\n"); indent--; fprintf(server, "\n"); - print_server("_StubMsg.Buffer = (unsigned char __RPC_FAR *)_pRpcMessage->Buffer;\n"); + print_server("_StubMsg.Buffer = (unsigned char *)_pRpcMessage->Buffer;\n"); fprintf(server, "\n"); print_server("*(("); write_type(server, def->type, def, def->tname); - fprintf(server, " __RPC_FAR *)_StubMsg.Buffer)++ = _RetVal;\n"); + fprintf(server, " *)_StubMsg.Buffer)++ = _RetVal;\n"); } indent--; @@ -306,7 +306,7 @@ static void write_stubdescriptor(type_t print_server("static const MIDL_STUB_DESC %s_StubDesc =\n", iface->name); print_server("{\n"); indent++; - print_server("(void __RPC_FAR *)& %s___RpcServerInterface,\n", iface->name); + print_server("(void *)& %s___RpcServerInterface,\n", iface->name); print_server("MIDL_user_allocate,\n"); print_server("MIDL_user_free,\n"); print_server("0,\n"); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 8883b3f..1ae84f1 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -236,7 +236,7 @@ void marshall_arguments(FILE *file, int print_file(file, indent, "*(("); write_type(file, var->type, var, var->tname); - fprintf(file, " __RPC_FAR*)_StubMsg.Buffer)++ = "); + fprintf(file, " *)_StubMsg.Buffer)++ = "); write_name(file, var); fprintf(file, ";\n"); fprintf(file, "\n"); @@ -306,7 +306,7 @@ void unmarshall_arguments(FILE *file, in write_name(file, var); fprintf(file, " = *(("); write_type(file, var->type, var, var->tname); - fprintf(file, " __RPC_FAR*)_StubMsg.Buffer)++;\n"); + fprintf(file, " *)_StubMsg.Buffer)++;\n"); fprintf(file, "\n"); last_size = size;

1 0

Stefan Leichter : winetest: Add d3d9 tests.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: e6b17d1b06a578be5552ba7946a29355add28f5a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e6b17d1b06a578be5552ba7… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Mon Dec 12 11:51:29 2005 +0100 winetest: Add d3d9 tests. --- programs/winetest/Makefile.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 5cea062..4208b94 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -26,6 +26,7 @@ TESTBINS = \ advapi32_test.exe$(DLLEXT) \ comctl32_test.exe$(DLLEXT) \ crypt32_test.exe$(DLLEXT) \ + d3d9_test.exe$(DLLEXT) \ dinput_test.exe$(DLLEXT) \ dsound_test.exe$(DLLEXT) \ gdi32_test.exe$(DLLEXT) \ @@ -104,6 +105,8 @@ comctl32_test.exe$(DLLEXT): $(DLLDIR)/co cp $(DLLDIR)/comctl32/tests/comctl32_test.exe$(DLLEXT) $@ && $(STRIP) $@ crypt32_test.exe$(DLLEXT): $(DLLDIR)/crypt32/tests/crypt32_test.exe$(DLLEXT) cp $(DLLDIR)/crypt32/tests/crypt32_test.exe$(DLLEXT) $@ && $(STRIP) $@ +d3d9_test.exe$(DLLEXT): $(DLLDIR)/d3d9/tests/d3d9_test.exe$(DLLEXT) + cp $(DLLDIR)/d3d9/tests/d3d9_test.exe$(DLLEXT) $@ && $(STRIP) $@ ddraw_test.exe$(DLLEXT): $(DLLDIR)/ddraw/tests/ddraw_test.exe$(DLLEXT) cp $(DLLDIR)/ddraw/tests/ddraw_test.exe$(DLLEXT) $@ && $(STRIP) $@ dinput_test.exe$(DLLEXT): $(DLLDIR)/dinput/tests/dinput_test.exe$(DLLEXT)

1 0

Paul Vriens : winecfg: Update Dutch resources for the Audio tab.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: 019aef9f5f5391df8486ca59bb06a3eb47b488ac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=019aef9f5f5391df8486ca5… Author: Paul Vriens <Paul.Vriens(a)xs4all.nl> Date: Mon Dec 12 11:50:57 2005 +0100 winecfg: Update Dutch resources for the Audio tab. --- programs/winecfg/Nl.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 3c8318a..b4cdf9a 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -154,13 +154,13 @@ BEGIN LTEXT "Geluidsbesturing: ",IDC_STATIC,10,20,60,8 COMBOBOX IDC_AUDIO_DRIVER,70,18,85,85,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Automatisch detecteren",IDC_AUDIO_AUTODETECT,170,18,79,14 - PUSHBUTTON "Configureer",IDC_AUDIO_CONFIGURE,170,38,49,14 - PUSHBUTTON "Configuratiescherm",IDC_AUDIO_CONTROL_PANEL,170,58,69,14 - - GROUPBOX " DirectSound ",IDC_STATIC,8,75,244,120 - LTEXT "Hardwareversnelling: ",IDC_STATIC,15,85,90,10 - COMBOBOX IDC_DSOUND_HW_ACCEL,100,83,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - CONTROL "Stuurprogramma emulatie",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,100,230,10 + PUSHBUTTON "Configureer",IDC_AUDIO_CONFIGURE,170,38,79,14 + PUSHBUTTON "Configuratiescherm",IDC_AUDIO_CONTROL_PANEL,170,58,79,14 + CONTROL "Apparaten",IDC_AUDIO_TREE,"SysTreeView32",WS_BORDER | WS_TABSTOP,10,40,150,160 + GROUPBOX " DirectSound ",IDC_STATIC,8,205,244,60 + LTEXT "Hardwareversnelling: ",IDC_STATIC,15,215,90,10 + COMBOBOX IDC_DSOUND_HW_ACCEL,100,213,150,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Stuurprogramma emulatie",IDC_DSOUND_DRV_EMUL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,230,230,10 END IDD_APPEARANCE DIALOG DISCARDABLE 0, 0, 260, 250

1 0

Jacek Caban : Added declaration of IHTMLDocument3 and more DISPIDs.
by Alexandre Julliard 12 Dec '05

12 Dec '05

Module: wine Branch: refs/heads/master Commit: f94acfdd7daacaac6f4cf1205f54d90ef2780f9e URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f94acfdd7daacaac6f4cf12… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 12 11:50:38 2005 +0100 Added declaration of IHTMLDocument3 and more DISPIDs. --- include/mshtmdid.h | 373 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mshtml.idl | 225 +++++++++++++++++++++++++++++++ 2 files changed, 598 insertions(+), 0 deletions(-)

1 0