January 2006 - Wine-Commits

Mike McCormack : kernel32: Declare BindIoCompletionCallback().
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: a1edebf523726ba20a7e18e09ca6e33452c83dcf URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a1edebf523726ba20a7e18e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 16 20:51:11 2006 +0100 kernel32: Declare BindIoCompletionCallback(). --- include/winbase.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index b6d98cc..7b193d4 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1216,6 +1216,7 @@ BOOL WINAPI Beep(DWORD,DWORD); HANDLE WINAPI BeginUpdateResourceA(LPCSTR,BOOL); HANDLE WINAPI BeginUpdateResourceW(LPCWSTR,BOOL); #define BeginUpdateResource WINELIB_NAME_AW(BeginUpdateResource) +BOOL WINAPI BindIoCompletionCallback(HANDLE,LPOVERLAPPED_COMPLETION_ROUTINE,ULONG); BOOL WINAPI BuildCommDCBA(LPCSTR,LPDCB); BOOL WINAPI BuildCommDCBW(LPCWSTR,LPDCB); #define BuildCommDCB WINELIB_NAME_AW(BuildCommDCB)

1 0

Robert Shearman : oleaut: Handle a non-byref variant being passed for a byref param in
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: 1f04fc6a491c8ab00d523f3dd847fd6ade91f19a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1f04fc6a491c8ab00d523f3… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 16 20:44:13 2006 +0100 oleaut: Handle a non-byref variant being passed for a byref param in ITypeInfo::Invoke. --- dlls/oleaut32/typelib.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9799b5b..64ae776 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5262,14 +5262,27 @@ static HRESULT WINAPI ITypeInfo_fnInvoke } else if (i < pDispParams->cArgs) { - V_VT(&rgvarg[i]) = V_VT(&pDispParams->rgvarg[pDispParams->cArgs - 1 - i]); - dump_Variant(&pDispParams->rgvarg[pDispParams->cArgs - 1 - i]); + VARIANTARG *src_arg = &pDispParams->rgvarg[pDispParams->cArgs - 1 - i]; + V_VT(&rgvarg[i]) = V_VT(src_arg); + dump_Variant(src_arg); + /* FIXME: this doesn't work for VT_BYREF arguments if * they are not the same type as in the paramdesc */ - hres = VariantChangeType(&rgvarg[i], &pDispParams->rgvarg[pDispParams->cArgs - 1 - i], 0, rgvt[i]); + if ((rgvt[i] & VT_BYREF) && !V_ISBYREF(src_arg)) + { + VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); + V_VT(&missing_arg[i]) = V_VT(src_arg); + hres = VariantChangeType(&missing_arg[i], src_arg, 0, rgvt[i] & ~VT_BYREF); + V_BYREF(&rgvarg[i]) = &V_NONE(&missing_arg[i]); + } + else + hres = VariantChangeType(&rgvarg[i], src_arg, 0, rgvt[i]); + if (FAILED(hres)) { - ERR("failed to convert param %d to vt %d\n", i, rgvt[i]); + ERR("failed to convert param %d to %s%s from %s%s\n", i, + debugstr_vt(rgvt[i]), debugstr_vf(rgvt[i]), + debugstr_VT(src_arg), debugstr_VF(src_arg)); break; } V_VT(&rgvarg[i]) = rgvt[i];

1 0

Robert Shearman : oleaut: Only allocate memory once for each array needed for the
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: d86f8d2ef2e12b66af5b0bd056e23d83e58eb874 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d86f8d2ef2e12b66af5b0bd… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 16 20:43:55 2006 +0100 oleaut: Only allocate memory once for each array needed for the arguments in ITypeInfo::Invoke. --- dlls/oleaut32/typelib.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 14aa8cd..9799b5b 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5167,6 +5167,17 @@ DispCallFunc( return S_OK; } +#define INVBUF_ELEMENT_SIZE \ + (sizeof(VARIANTARG) + sizeof(VARIANTARG) + sizeof(VARIANTARG *) + sizeof(VARTYPE)) +#define INVBUF_GET_ARG_ARRAY(buffer, params) \ + ((VARIANTARG *)(buffer)) +#define INVBUF_GET_MISSING_ARG_ARRAY(buffer, params) \ + ((VARIANTARG *)((char *)(buffer) + sizeof(VARIANTARG) * (params))) +#define INVBUF_GET_ARG_PTR_ARRAY(buffer, params) \ + ((VARIANTARG **)((char *)(buffer) + (sizeof(VARIANTARG) + sizeof(VARIANTARG)) * (params))) +#define INVBUF_GET_ARG_TYPE_ARRAY(buffer, params) \ + ((VARTYPE *)((char *)(buffer) + (sizeof(VARIANTARG) + sizeof(VARIANTARG) + sizeof(VARIANTARG *)) * (params))) + static HRESULT WINAPI ITypeInfo_fnInvoke( ITypeInfo2 *iface, VOID *pIUnk, @@ -5207,12 +5218,12 @@ static HRESULT WINAPI ITypeInfo_fnInvoke switch (func_desc->funckind) { case FUNC_PUREVIRTUAL: case FUNC_VIRTUAL: { - VARIANTARG *rgvarg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*rgvarg) * func_desc->cParams); - VARIANTARG **prgpvarg = HeapAlloc(GetProcessHeap(), 0, sizeof(*prgpvarg) * func_desc->cParams); - VARTYPE *rgvt = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*rgvt) * func_desc->cParams); - VARIANTARG *missing_arg = HeapAlloc(GetProcessHeap(), 0, sizeof(*missing_arg) * func_desc->cParams); + void *buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, INVBUF_ELEMENT_SIZE * func_desc->cParams); VARIANT varresult; VARIANT retval; /* pointer for storing byref retvals in */ + VARIANTARG **prgpvarg = INVBUF_GET_ARG_PTR_ARRAY(buffer, func_desc->cParams); + VARIANTARG *rgvarg = INVBUF_GET_ARG_ARRAY(buffer, func_desc->cParams); + VARTYPE *rgvt = INVBUF_GET_ARG_TYPE_ARRAY(buffer, func_desc->cParams); hres = S_OK; for (i = 0; i < func_desc->cParams; i++) @@ -5227,6 +5238,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke for (i = 0; i < func_desc->cParams; i++) { USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; + if (wParamFlags & PARAMFLAG_FRETVAL) { /* note: this check is placed so that if the caller passes @@ -5275,6 +5287,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke } else { + VARIANTARG *missing_arg = INVBUF_GET_MISSING_ARG_ARRAY(buffer, func_desc->cParams); V_VT(arg) = VT_VARIANT | VT_BYREF; V_VARIANTREF(arg) = &missing_arg[i]; V_VT(V_VARIANTREF(arg)) = VT_ERROR; @@ -5310,7 +5323,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke { if (TRACE_ON(ole)) { - TRACE("varresult: "); + TRACE("[retval] value: "); dump_Variant(prgpvarg[i]); } @@ -5362,10 +5375,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke } func_fail: - HeapFree(GetProcessHeap(), 0, missing_arg); - HeapFree(GetProcessHeap(), 0, prgpvarg); - HeapFree(GetProcessHeap(), 0, rgvarg); - HeapFree(GetProcessHeap(), 0, rgvt); + HeapFree(GetProcessHeap(), 0, buffer); break; } case FUNC_DISPATCH: {

1 0

Robert Shearman : oleaut: Simplify missing argument handling in ITypeInfo::Invoke.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: 0f8db3fecac4ef1b8d30d571832d7b80aa319fc6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0f8db3fecac4ef1b8d30d57… Author: Robert Shearman <rob(a)codeweavers.com> Date: Mon Jan 16 20:43:20 2006 +0100 oleaut: Simplify missing argument handling in ITypeInfo::Invoke. Simplify missing argument handling by pre-allocating an array of the maximum number of missing arguments there could be. --- dlls/oleaut32/typelib.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 983eda3..14aa8cd 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5207,30 +5207,22 @@ static HRESULT WINAPI ITypeInfo_fnInvoke switch (func_desc->funckind) { case FUNC_PUREVIRTUAL: case FUNC_VIRTUAL: { - VARIANTARG *rgvarg = NULL; + VARIANTARG *rgvarg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*rgvarg) * func_desc->cParams); VARIANTARG **prgpvarg = HeapAlloc(GetProcessHeap(), 0, sizeof(*prgpvarg) * func_desc->cParams); VARTYPE *rgvt = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*rgvt) * func_desc->cParams); + VARIANTARG *missing_arg = HeapAlloc(GetProcessHeap(), 0, sizeof(*missing_arg) * func_desc->cParams); VARIANT varresult; - SHORT missing_param_offset = func_desc->cParams; - SHORT missing_params = 0; VARIANT retval; /* pointer for storing byref retvals in */ hres = S_OK; for (i = 0; i < func_desc->cParams; i++) { TYPEDESC *tdesc = &func_desc->lprgelemdescParam[i].tdesc; - USHORT wParamFlags = func_desc->lprgelemdescParam[i].u.paramdesc.wParamFlags; hres = typedescvt_to_variantvt((ITypeInfo *)iface, tdesc, &rgvt[i]); if (FAILED(hres)) goto func_fail; - if ((i >= pDispParams->cArgs) && - (wParamFlags & PARAMFLAG_FOPT) && - !(wParamFlags & PARAMFLAG_FHASDEFAULT)) - missing_params++; } - rgvarg = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*rgvarg) * (func_desc->cParams + missing_params)); - TRACE("changing args\n"); for (i = 0; i < func_desc->cParams; i++) { @@ -5284,8 +5276,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke else { V_VT(arg) = VT_VARIANT | VT_BYREF; - V_VARIANTREF(arg) = &rgvarg[missing_param_offset]; - missing_param_offset++; + V_VARIANTREF(arg) = &missing_arg[i]; V_VT(V_VARIANTREF(arg)) = VT_ERROR; V_ERROR(V_VARIANTREF(arg)) = DISP_E_PARAMNOTFOUND; } @@ -5371,6 +5362,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke } func_fail: + HeapFree(GetProcessHeap(), 0, missing_arg); HeapFree(GetProcessHeap(), 0, prgpvarg); HeapFree(GetProcessHeap(), 0, rgvarg); HeapFree(GetProcessHeap(), 0, rgvt);

1 0

Huw Davies : msxml: Fix for get_nodeValue on attributes.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: e7187ff31f047f4d64d81edd5f8be84e2c7ab6e5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e7187ff31f047f4d64d81ed… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 16 20:43:02 2006 +0100 msxml: Fix for get_nodeValue on attributes. --- dlls/msxml3/node.c | 6 +++++- dlls/msxml3/tests/domdoc.c | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 44d4b8f..4001ad4 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -225,10 +225,14 @@ static HRESULT WINAPI xmlnode_get_nodeVa switch ( This->node->type ) { case XML_ATTRIBUTE_NODE: + { + xmlChar *content = xmlNodeGetContent(This->node); V_VT(value) = VT_BSTR; - V_BSTR(value) = bstr_from_xmlChar( This->node->name ); + V_BSTR(value) = bstr_from_xmlChar( content ); + xmlFree(content); r = S_OK; break; + } case XML_TEXT_NODE: V_VT(value) = VT_BSTR; V_BSTR(value) = bstr_from_xmlChar( This->node->content ); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6bf26cb..5d745ce 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -404,6 +404,12 @@ void test_domnode( void ) ok( r == S_OK, "get_baseName returned wrong code\n"); ok( lstrcmpW(str,szdl) == 0, "basename was wrong\n"); + r = IXMLDOMNode_get_nodeValue( node, &var ); + ok( r == S_OK, "returns %08lx\n", r ); + ok( V_VT(&var) == VT_BSTR, "vt %x\n", V_VT(&var)); + ok( !lstrcmpW(V_BSTR(&var), szstr1), "nodeValue incorrect\n"); + VariantClear(&var); + r = IXMLDOMNode_get_childNodes( node, NULL ); ok( r == E_INVALIDARG, "get_childNodes returned wrong code\n");

1 0

Huw Davies : msxml: Implement setAttribute.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: 65707fb940bdce4f4df81bcd234a97ddce4721e6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=65707fb940bdce4f4df81bc… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 16 20:42:39 2006 +0100 msxml: Implement setAttribute. --- dlls/msxml3/element.c | 35 +++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 76 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 106 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 38c3591..9f4ba3e 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -484,10 +484,39 @@ static HRESULT WINAPI domelem_getAttribu static HRESULT WINAPI domelem_setAttribute( IXMLDOMElement *iface, - BSTR p, VARIANT var) + BSTR name, VARIANT value) { - FIXME("\n"); - return E_NOTIMPL; + domelem *This = impl_from_IXMLDOMElement( iface ); + xmlNodePtr element; + xmlChar *xml_name, *xml_value; + HRESULT hr; + VARIANT var; + + TRACE("(%p)->(%s, var)\n", This, debugstr_w(name)); + + element = get_element( This ); + if ( !element ) + return E_FAIL; + + VariantInit(&var); + hr = VariantChangeType(&var, &value, 0, VT_BSTR); + if(hr != S_OK) + { + FIXME("VariantChangeType failed\n"); + return hr; + } + + xml_name = xmlChar_from_wchar( name ); + xml_value = xmlChar_from_wchar( V_BSTR(&var) ); + + if(!xmlSetNsProp(element, NULL, xml_name, xml_value)) + hr = E_FAIL; + + HeapFree(GetProcessHeap(), 0, xml_value); + HeapFree(GetProcessHeap(), 0, xml_name); + VariantClear(&var); + + return hr; } static HRESULT WINAPI domelem_removeAttribute( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 098b428..6bf26cb 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -72,6 +72,7 @@ static const WCHAR szdl[] = { 'd','l',0 static const WCHAR szlc[] = { 'l','c',0 }; static const WCHAR szbs[] = { 'b','s',0 }; static const WCHAR szstr1[] = { 's','t','r','1',0 }; +static const WCHAR szstr2[] = { 's','t','r','2',0 }; void test_domdoc( void ) { @@ -622,11 +623,13 @@ static void test_create(void) { HRESULT r; VARIANT var; - BSTR str; + BSTR str, name; IXMLDOMDocument *doc; + IXMLDOMElement *element; IXMLDOMNode *root, *node, *child; + IXMLDOMNamedNodeMap *attr_map; IUnknown *unk; - LONG ref; + LONG ref, num; r = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); @@ -682,6 +685,75 @@ static void test_create(void) ok( node == child, "%p %p\n", node, child ); IXMLDOMNode_Release( child ); IXMLDOMNode_Release( node ); + + + r = IXMLDOMNode_QueryInterface( root, &IID_IXMLDOMElement, (LPVOID*)&element ); + ok( r == S_OK, "returns %08lx\n", r ); + + r = IXMLDOMElement_get_attributes( element, &attr_map ); + ok( r == S_OK, "returns %08lx\n", r ); + r = IXMLDOMNamedNodeMap_get_length( attr_map, &num ); + ok( r == S_OK, "returns %08lx\n", r ); + ok( num == 0, "num %ld\n", num ); + IXMLDOMNamedNodeMap_Release( attr_map ); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString( szstr1 ); + name = SysAllocString( szdl ); + r = IXMLDOMElement_setAttribute( element, name, var ); + ok( r == S_OK, "returns %08lx\n", r ); + r = IXMLDOMElement_get_attributes( element, &attr_map ); + ok( r == S_OK, "returns %08lx\n", r ); + r = IXMLDOMNamedNodeMap_get_length( attr_map, &num ); + ok( r == S_OK, "returns %08lx\n", r ); + ok( num == 1, "num %ld\n", num ); + IXMLDOMNamedNodeMap_Release( attr_map ); + VariantClear(&var); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString( szstr2 ); + r = IXMLDOMElement_setAttribute( element, name, var ); + ok( r == S_OK, "returns %08lx\n", r ); + r = IXMLDOMElement_get_attributes( element, &attr_map ); + ok( r == S_OK, "returns %08lx\n", r ); + r = IXMLDOMNamedNodeMap_get_length( attr_map, &num ); + ok( r == S_OK, "returns %08lx\n", r ); + ok( num == 1, "num %ld\n", num ); + IXMLDOMNamedNodeMap_Release( attr_map ); + VariantClear(&var); + r = IXMLDOMElement_getAttribute( element, name, &var ); + ok( r == S_OK, "returns %08lx\n", r ); + ok( !lstrcmpW(V_BSTR(&var), szstr2), "wrong attr value\n"); + VariantClear(&var); + SysFreeString(name); + + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString( szstr1 ); + name = SysAllocString( szlc ); + r = IXMLDOMElement_setAttribute( element, name, var ); + ok( r == S_OK, "returns %08lx\n", r ); + r = IXMLDOMElement_get_attributes( element, &attr_map ); + ok( r == S_OK, "returns %08lx\n", r ); + r = IXMLDOMNamedNodeMap_get_length( attr_map, &num ); + ok( r == S_OK, "returns %08lx\n", r ); + ok( num == 2, "num %ld\n", num ); + IXMLDOMNamedNodeMap_Release( attr_map ); + VariantClear(&var); + SysFreeString(name); + + V_VT(&var) = VT_I4; + V_I4(&var) = 10; + name = SysAllocString( szbs ); + r = IXMLDOMElement_setAttribute( element, name, var ); + ok( r == S_OK, "returns %08lx\n", r ); + VariantClear(&var); + r = IXMLDOMElement_getAttribute( element, name, &var ); + ok( r == S_OK, "returns %08lx\n", r ); + ok( V_VT(&var) == VT_BSTR, "variant type %x\n", V_VT(&var)); + VariantClear(&var); + SysFreeString(name); + + IXMLDOMElement_Release( element ); IXMLDOMNode_Release( root ); IXMLDOMDocument_Release( doc ); }

1 0

Saulius Krasuckas : mscms: Collect some data during profile enumeration.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: 191f21c7d40e023924c3c9d9658e501f2a61d850 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=191f21c7d40e023924c3c9d… Author: Saulius Krasuckas <saulius.krasuckas(a)gmail.com> Date: Mon Jan 16 20:42:24 2006 +0100 mscms: Collect some data during profile enumeration. --- dlls/mscms/tests/profile.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/tests/profile.c b/dlls/mscms/tests/profile.c index 1f0f986..39f90a7 100644 --- a/dlls/mscms/tests/profile.c +++ b/dlls/mscms/tests/profile.c @@ -442,9 +442,11 @@ static void test_GetCountColorProfileEle typedef struct colorspace_description_struct { DWORD dwID; char *szName; + BOOL registered; + char filename[MAX_PATH]; } colorspace_descr; -#define describe_colorspace(id) {id, #id} +#define describe_colorspace(id) {id, #id, FALSE, ""} colorspace_descr known_colorspaces[] = { describe_colorspace(SPACE_XYZ), @@ -478,12 +480,14 @@ static void enum_registered_color_profil present = 0; trace("\n"); - trace("Searching for registered standard colorspace profiles:\n"); + trace("Querying registered standard colorspace profiles via GetStandardColorSpaceProfileA():\n"); for (i=0; i<count; i++) { ret = pGetStandardColorSpaceProfileA(NULL, known_colorspaces[i].dwID, profile, &size); if (ret) { + lstrcpynA(known_colorspaces[i].filename, profile, MAX_PATH); + known_colorspaces[i].registered = TRUE; present++; trace(" found %s, pointing to '%s' (%d chars)\n", known_colorspaces[i].szName, profile, strlen(profile)); }

1 0

Hans Leidekker : kernel: Documentation cleanups.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: 9ba1876c40e13672cc16e3ddbdda2633334ee474 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9ba1876c40e13672cc16e3d… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Mon Jan 16 20:42:09 2006 +0100 kernel: Documentation cleanups. --- dlls/kernel/virtual.c | 385 ++++++++++++++++++++++++++++++------------------- 1 files changed, 232 insertions(+), 153 deletions(-)

1 0

Rein Klazes : user: Avoid buffer overflow in sysparams.c.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: de9400262e6187ef38a46b2bc1952d4ea399644d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=de9400262e6187ef38a46b2… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Mon Jan 16 20:41:57 2006 +0100 user: Avoid buffer overflow in sysparams.c. Increase buffer size to 12 for getting and setting integer parameters from/to the registry. --- dlls/user/sysparams.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index dde61ff..900a499 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -748,7 +748,7 @@ static BOOL get_uint_param( unsigned int if (!ret_ptr) return FALSE; if (!spi_loaded[idx]) { - WCHAR buf[10]; + WCHAR buf[12]; if (SYSPARAMS_Load( regkey, value, buf, sizeof(buf) )) *value_ptr = atoiW( buf ); spi_loaded[idx] = TRUE; @@ -764,7 +764,7 @@ static BOOL get_twips_param( unsigned in if (!ret_ptr) return FALSE; if (!spi_loaded[idx]) { - WCHAR buf[10]; + WCHAR buf[12]; if (SYSPARAMS_Load( regkey, value, buf, sizeof(buf) )) *value_ptr = SYSPARAMS_Twips2Pixels( atoiW(buf) ); @@ -785,7 +785,7 @@ static inline BOOL get_bool_param( unsig static BOOL set_uint_param_mirrored( unsigned int idx, LPCWSTR regkey, LPCWSTR regkey_mirror, LPCWSTR value, UINT *value_ptr, UINT new_val, UINT fWinIni ) { - WCHAR buf[10]; + WCHAR buf[12]; wsprintfW(buf, CSu, new_val); if (!SYSPARAMS_Save( regkey, value, buf, fWinIni )) return FALSE; @@ -799,7 +799,7 @@ static BOOL set_uint_param_mirrored( uns static BOOL save_int_param( LPCWSTR regkey, LPCWSTR value, INT *value_ptr, INT new_val, UINT fWinIni ) { - WCHAR buf[10]; + WCHAR buf[12]; wsprintfW(buf, CSd, new_val); if (!SYSPARAMS_Save( regkey, value, buf, fWinIni )) return FALSE; @@ -1172,7 +1172,7 @@ BOOL WINAPI SystemParametersInfoW( UINT spi_idx = SPI_SETMOUSE_IDX; if (!spi_loaded[spi_idx]) { - WCHAR buf[10]; + WCHAR buf[12]; if (SYSPARAMS_Load( SPI_SETMOUSE_REGKEY, SPI_SETMOUSE_VALNAME1, buf, sizeof(buf) )) @@ -1278,7 +1278,7 @@ BOOL WINAPI SystemParametersInfoW( UINT case SPI_SETSCREENSAVEACTIVE: /* 17 */ { - WCHAR buf[5]; + WCHAR buf[12]; wsprintfW(buf, CSu, uiParam); USER_Driver->pSetScreenSaveActive( uiParam );

1 0

Mike McCormack : programs: Use WIN32_LEAN_AND_MEAN in some more places.
by Alexandre Julliard Jan. 16, 2006

Jan. 16, 2006

Module: wine Branch: refs/heads/master Commit: 7d665672539be9dba5c91765bd82cf39d8e0caac URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7d665672539be9dba5c9176… Author: Mike McCormack <mike(a)codeweavers.com> Date: Mon Jan 16 20:41:34 2006 +0100 programs: Use WIN32_LEAN_AND_MEAN in some more places. --- programs/control/control.c | 4 +++- programs/eject/eject.c | 2 ++ programs/expand/expand.c | 2 ++ programs/hh/main.c | 2 ++ programs/msiexec/msiexec.c | 2 ++ programs/progman/dialog.c | 2 ++ programs/progman/group.c | 2 ++ programs/progman/grpfile.c | 2 ++ programs/progman/program.c | 2 ++ programs/progman/string.c | 2 ++ programs/wcmd/builtins.c | 2 ++ programs/wcmd/directory.c | 2 ++ programs/winecfg/appdefaults.c | 1 + programs/winecfg/libraries.c | 1 + programs/winecfg/properties.c | 2 ++ programs/winepath/winepath.c | 2 ++ 16 files changed, 31 insertions(+), 1 deletions(-) diff --git a/programs/control/control.c b/programs/control/control.c index 15a7bc4..49f514d 100644 --- a/programs/control/control.c +++ b/programs/control/control.c @@ -17,6 +17,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include <stdio.h> #include <string.h> #include <windows.h> @@ -27,7 +29,7 @@ extern void WINAPI Control_RunDLL(HWND h static void launch(const char *what) { Control_RunDLL(GetDesktopWindow(), 0, what, SW_SHOW); - exit(0); + ExitProcess(0); } int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpszCmdLine, INT nCmdShow) diff --git a/programs/eject/eject.c b/programs/eject/eject.c index 761fdfb..bf3d514 100644 --- a/programs/eject/eject.c +++ b/programs/eject/eject.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include "config.h" #include <windows.h> diff --git a/programs/expand/expand.c b/programs/expand/expand.c index 6437246..a2f5e88 100644 --- a/programs/expand/expand.c +++ b/programs/expand/expand.c @@ -17,6 +17,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include <stdio.h> #include <string.h> #include <windows.h> diff --git a/programs/hh/main.c b/programs/hh/main.c index 494c6ce..51a5b8b 100644 --- a/programs/hh/main.c +++ b/programs/hh/main.c @@ -16,6 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include <windows.h> typedef int WINAPI DOWINMAIN(HMODULE hMod, LPSTR cmdline); diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index cff4dda..7ec8831 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include <windows.h> #include <msi.h> #include <objbase.h> diff --git a/programs/progman/dialog.c b/programs/progman/dialog.c index 0aea722..fbfdc23 100644 --- a/programs/progman/dialog.c +++ b/programs/progman/dialog.c @@ -20,6 +20,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include "windows.h" #include "commdlg.h" #include "progman.h" diff --git a/programs/progman/group.c b/programs/progman/group.c index 211776d..2f8c5fc 100644 --- a/programs/progman/group.c +++ b/programs/progman/group.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include <stdio.h> #include <string.h> #include "windows.h" diff --git a/programs/progman/grpfile.c b/programs/progman/grpfile.c index 024d402..8174308 100644 --- a/programs/progman/grpfile.c +++ b/programs/progman/grpfile.c @@ -19,6 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include "windows.h" #include "wine/winuser16.h" #include "progman.h" diff --git a/programs/progman/program.c b/programs/progman/program.c index 9ad4727..783d415 100644 --- a/programs/progman/program.c +++ b/programs/progman/program.c @@ -18,6 +18,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include <string.h> #include "windows.h" #include "windowsx.h" diff --git a/programs/progman/string.c b/programs/progman/string.c index ea0a8dc..9760388 100644 --- a/programs/progman/string.c +++ b/programs/progman/string.c @@ -19,6 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include "windows.h" #include "progman.h" diff --git a/programs/wcmd/builtins.c b/programs/wcmd/builtins.c index a47bc0a..addb3c7 100644 --- a/programs/wcmd/builtins.c +++ b/programs/wcmd/builtins.c @@ -32,6 +32,8 @@ * - Messages etc need international support */ +#define WIN32_LEAN_AND_MEAN + #include "wcmd.h" void WCMD_execute (char *orig_command, char *parameter, char *substitution); diff --git a/programs/wcmd/directory.c b/programs/wcmd/directory.c index 8046500..4820f47 100644 --- a/programs/wcmd/directory.c +++ b/programs/wcmd/directory.c @@ -27,6 +27,8 @@ #define NONAMELESSUNION #define NONAMELESSSTRUCT +#define WIN32_LEAN_AND_MEAN + #include "wcmd.h" int WCMD_dir_sort (const void *a, const void *b); diff --git a/programs/winecfg/appdefaults.c b/programs/winecfg/appdefaults.c index 235f0d8..681d21c 100644 --- a/programs/winecfg/appdefaults.c +++ b/programs/winecfg/appdefaults.c @@ -21,6 +21,7 @@ * */ +#define WIN32_LEAN_AND_MEAN #define NONAMELESSUNION #include <windows.h> #include <commdlg.h> diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c index c044433..4ae431d 100644 --- a/programs/winecfg/libraries.c +++ b/programs/winecfg/libraries.c @@ -21,6 +21,7 @@ */ #define NONAMELESSUNION +#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <commdlg.h> #include <wine/debug.h> diff --git a/programs/winecfg/properties.c b/programs/winecfg/properties.c index 7f63a6f..482448c 100644 --- a/programs/winecfg/properties.c +++ b/programs/winecfg/properties.c @@ -20,6 +20,8 @@ * */ +#define WIN32_LEAN_AND_MEAN + #include <windows.h> #include "properties.h" diff --git a/programs/winepath/winepath.c b/programs/winepath/winepath.c index f5886c2..a16831f 100644 --- a/programs/winepath/winepath.c +++ b/programs/winepath/winepath.c @@ -20,6 +20,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define WIN32_LEAN_AND_MEAN + #include "config.h" #include <windows.h>

1 0