January 2008 - Wine-Commits

Austin English : msi: Fix several typos.
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: 92e7fed80cde982772be2b6713693a8ca8ab41b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e7fed80cde982772be2b671… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Dec 31 12:06:07 2007 -0600 msi: Fix several typos. --- dlls/msi/classes.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 92c333d..aca7c93 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -178,7 +178,7 @@ static MSIPROGID *load_progid( MSIPACKAGE* package, MSIRECORD *row ) while (parent->Parent && parent->Parent != parent) parent = parent->Parent; - /* FIXME: need to determing if we are really the CurVer */ + /* FIXME: need to determine if we are really the CurVer */ progid->CurVer = parent; parent->VersionInd = progid; @@ -445,7 +445,7 @@ static MSIEXTENSION *load_extension( MSIPACKAGE* package, MSIRECORD *row ) /* * While the extension table has 2 primary keys, this function is only looking - * at the Extension key which is what is referenced as a forign key + * at the Extension key which is what is referenced as a foreign key */ static MSIEXTENSION *load_given_extension( MSIPACKAGE *package, LPCWSTR name ) { @@ -512,7 +512,7 @@ static UINT iterate_load_verb(MSIRECORD *row, LPVOID param) buffer = MSI_RecordGetString(row,5); deformat_string(package,buffer,&verb->Argument); - /* assosiate the verb with the correct extension */ + /* associate the verb with the correct extension */ list_add_tail( &extension->verbs, &verb->entry ); return ERROR_SUCCESS; @@ -1252,7 +1252,7 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) LPWSTR key; /* - * check if the MIME is to be installed. Either as requesed by an + * check if the MIME is to be installed. Either as requested by an * extension or Class */ mt->InstallMe = (mt->InstallMe ||

1 0

Lionel Debroux : msi: Correctly handle return value of msi_realloc.
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: 99ad76c3c18a7437f6abe4815ec2c572a0fffa03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99ad76c3c18a7437f6abe4815… Author: Lionel Debroux <lionel_debroux(a)yahoo.fr> Date: Sun Dec 30 19:01:09 2007 +0100 msi: Correctly handle return value of msi_realloc. --- dlls/msi/action.c | 10 +++++++--- dlls/msi/database.c | 20 ++++++++++++++------ 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 4d71822..b1841f7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4482,7 +4482,7 @@ static UINT ACTION_InstallServices( MSIPACKAGE *package ) /* converts arg1[~]arg2[~]arg3 to a list of ptrs to the strings */ static LPCWSTR *msi_service_args_to_vector(LPWSTR args, DWORD *numargs) { - LPCWSTR *vector; + LPCWSTR *vector, *temp_vector; LPWSTR p, q; DWORD sep_len; @@ -4508,9 +4508,13 @@ static LPCWSTR *msi_service_args_to_vector(LPWSTR args, DWORD *numargs) { *q = '\0'; - vector = msi_realloc(vector, (*numargs + 1) * sizeof(LPWSTR)); - if (!vector) + temp_vector = msi_realloc(vector, (*numargs + 1) * sizeof(LPWSTR)); + if (!temp_vector) + { + msi_free(vector); return NULL; + } + vector = temp_vector; p = q + sep_len; } diff --git a/dlls/msi/database.c b/dlls/msi/database.c index a690ee4..f3022f4 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -353,7 +353,7 @@ static LPWSTR msi_build_createsql_prelude(LPWSTR table) static LPWSTR msi_build_createsql_columns(LPWSTR *columns_data, LPWSTR *types, DWORD num_columns) { - LPWSTR columns; + LPWSTR columns, p; LPCWSTR type; DWORD sql_size = 1, i, len; WCHAR expanded[128], *ptr; @@ -413,9 +413,13 @@ static LPWSTR msi_build_createsql_columns(LPWSTR *columns_data, LPWSTR *types, D sprintfW(expanded, column_fmt, columns_data[i], type, size, extra, comma); sql_size += lstrlenW(expanded); - columns = msi_realloc(columns, sql_size * sizeof(WCHAR)); - if (!columns) + p = msi_realloc(columns, sql_size * sizeof(WCHAR)); + if (!p) + { + msi_free(columns); return NULL; + } + columns = p; lstrcatW(columns, expanded); } @@ -519,7 +523,7 @@ static LPWSTR msi_build_insertsql_prelude(LPWSTR table) static LPWSTR msi_build_insertsql_columns(LPWSTR *columns_data, LPWSTR *types, DWORD num_columns) { - LPWSTR columns; + LPWSTR columns, p; DWORD sql_size = 1, i; WCHAR expanded[128]; @@ -540,9 +544,13 @@ static LPWSTR msi_build_insertsql_columns(LPWSTR *columns_data, LPWSTR *types, D expanded[lstrlenW(expanded) - 2] = '\0'; } - columns = msi_realloc(columns, sql_size * sizeof(WCHAR)); - if (!columns) + p = msi_realloc(columns, sql_size * sizeof(WCHAR)); + if (!p) + { + msi_free(columns); return NULL; + } + columns = p; lstrcatW(columns, expanded); }

1 0

Gerald Pfeifer : ole32: Remove one noop check in CoWaitForMultipleHandles() .
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: 76e7cc942362df3399762b10f42c4ebe603a3362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76e7cc942362df3399762b10f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jan 1 14:14:24 2008 +0100 ole32: Remove one noop check in CoWaitForMultipleHandles(). --- dlls/ole32/compobj.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 6c837a1..2ccccdf 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3508,7 +3508,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, (dwFlags & COWAIT_ALERTABLE) ? TRUE : FALSE); } - if ((res >= WAIT_OBJECT_0) && (res < WAIT_OBJECT_0 + cHandles)) + if (res < WAIT_OBJECT_0 + cHandles) { /* handle signaled, store index */ *lpdwindex = (res - WAIT_OBJECT_0);

1 0

Reece H. Dunn : gdiplus: Added the ProfileNotFound status code.
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: 66dc01be56008b7f92c98c7f8d6d895ee142d17a URL: http://source.winehq.org/git/wine.git/?a=commit;h=66dc01be56008b7f92c98c7f8… Author: Reece H. Dunn <msclrhd(a)gmail.com> Date: Sun Dec 30 10:12:05 2007 +0000 gdiplus: Added the ProfileNotFound status code. --- include/gdiplustypes.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/include/gdiplustypes.h b/include/gdiplustypes.h index c9a5740..29616e9 100644 --- a/include/gdiplustypes.h +++ b/include/gdiplustypes.h @@ -42,7 +42,8 @@ enum Status{ UnsupportedGdiplusVersion = 17, GdiplusNotInitialized = 18, PropertyNotFound = 19, - PropertyNotSupported = 20 + PropertyNotSupported = 20, + ProfileNotFound = 21 };

1 0

Michael Stefaniuc : netapi32: Remove two unused global variables.
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: a4ec3ff61b43f93c0b22cb15745704b1b3c75e12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ec3ff61b43f93c0b22cb157… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jan 1 19:10:07 2008 +0100 netapi32: Remove two unused global variables. --- dlls/netapi32/access.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index dc9498b..028c1ca 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -58,10 +58,6 @@ struct sam_user LPWSTR user_logon_script_path; }; -static const WCHAR sAdminUserName[] = {'A','d','m','i','n','i','s','t','r','a','t', - 'o','r',0}; -static const WCHAR sGuestUserName[] = {'G','u','e','s','t',0}; - static struct list user_list = LIST_INIT( user_list ); BOOL NETAPI_IsLocalComputer(LPCWSTR ServerName);

1 0

Gerald Pfeifer : qcap: Complete initializers for g_cTemplates[].
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: f36602d5cb7f1bfb9a001ed1c06dee81b8181c45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f36602d5cb7f1bfb9a001ed1c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jan 1 17:33:27 2008 +0100 qcap: Complete initializers for g_cTemplates[]. --- dlls/qcap/qcap_main.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index 6e3cca2..93ae555 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -82,66 +82,79 @@ static CFactoryTemplate const g_cTemplates[] = { wAudioCaptureFilter, &CLSID_AudioCaptureFilter, QCAP_createAudioCaptureFilter, + NULL, NULL },{ wAVICompressor, &CLSID_AVICompressor, QCAP_createAVICompressor, + NULL, NULL },*/{ wVFWCaptFilter, &CLSID_VfwCapture, QCAP_createVFWCaptureFilter, + NULL, NULL },/*{ wVFWCaptFilterProp, &CLSID_VFWCaptureFilterPropertyPage, QCAP_createVFWCaptureFilterPropertyPage, + NULL, NULL },{ wAVIMux, &CLSID_AVImux, QCAP_createAVImux, + NULL, NULL },{ wAVIMuxPropPage, &CLSID_AVImuxPropertyPage, QCAP_createAVImuxPropertyPage, + NULL, NULL },{ wAVIMuxPropPage1, &CLSID_AVImuxPropertyPage1, QCAP_createAVImuxPropertyPage1, + NULL, NULL },{ wFileWriter, &CLSID_FileWriter, QCAP_createFileWriter, + NULL, NULL },*/{ wCaptGraphBuilder, &CLSID_CaptureGraphBuilder, QCAP_createCaptureGraphBuilder2, + NULL, NULL },{ wCaptGraphBuilder2, &CLSID_CaptureGraphBuilder2, QCAP_createCaptureGraphBuilder2, + NULL, NULL }/*,{ wInfPinTeeFilter, &CLSID_InfinitePinTeeFilter, QCAP_createInfinitePinTeeFilter, + NULL, NULL },{ wSmartTeeFilter, &CLSID_SmartTeeFilter, QCAP_createSmartTeeFilter, + NULL, NULL },{ wAudioInMixerProp, &CLSID_AudioInputMixerPropertyPage, QCAP_createAudioInputMixerPropertyPage, + NULL, NULL }*/ };

1 0

Gerald Pfeifer : wined3d: Simplify three checks based on the unsignedness of variables.
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: 520832451f99aad0a9076a34a50fc684e0aaa3a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=520832451f99aad0a9076a34a… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jan 1 14:25:28 2008 +0100 wined3d: Simplify three checks based on the unsignedness of variables. --- dlls/wined3d/device.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1eaf952..9ebce5e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5337,7 +5337,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetPaletteEntries(IWineD3DDevice *ifa IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; int j; TRACE("(%p) : PaletteNumber %u\n", This, PaletteNumber); - if ( PaletteNumber < 0 || PaletteNumber >= MAX_PALETTES) { + if (PaletteNumber >= MAX_PALETTES) { WARN("(%p) : (%u) Out of range 0-%u, returning Invalid Call\n", This, PaletteNumber, MAX_PALETTES); return WINED3DERR_INVALIDCALL; } @@ -5355,7 +5355,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetPaletteEntries(IWineD3DDevice *ifa IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; int j; TRACE("(%p) : PaletteNumber %u\n", This, PaletteNumber); - if ( PaletteNumber < 0 || PaletteNumber >= MAX_PALETTES) { + if (PaletteNumber >= MAX_PALETTES) { WARN("(%p) : (%u) Out of range 0-%u, returning Invalid Call\n", This, PaletteNumber, MAX_PALETTES); return WINED3DERR_INVALIDCALL; } @@ -5372,7 +5372,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetPaletteEntries(IWineD3DDevice *ifa static HRESULT WINAPI IWineD3DDeviceImpl_SetCurrentTexturePalette(IWineD3DDevice *iface, UINT PaletteNumber) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; TRACE("(%p) : PaletteNumber %u\n", This, PaletteNumber); - if ( PaletteNumber < 0 || PaletteNumber >= MAX_PALETTES) { + if (PaletteNumber >= MAX_PALETTES) { WARN("(%p) : (%u) Out of range 0-%u, returning Invalid Call\n", This, PaletteNumber, MAX_PALETTES); return WINED3DERR_INVALIDCALL; }

1 0

Alexandre Julliard : crypt32: Avoid casting away const from the context pointer.
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: 8926dce077cb3a2b210da45381278c14c31a7513 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8926dce077cb3a2b210da4538… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 2 12:22:16 2008 +0100 crypt32: Avoid casting away const from the context pointer. --- dlls/crypt32/context.c | 2 +- dlls/crypt32/crl.c | 22 ++++++++++------------ dlls/crypt32/crypt32_private.h | 2 +- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/crypt32/context.c b/dlls/crypt32/context.c index 50fec4d..a5b749f 100644 --- a/dlls/crypt32/context.c +++ b/dlls/crypt32/context.c @@ -125,7 +125,7 @@ void *Context_GetLinkedContext(void *context, size_t contextSize) contextSize); } -PCONTEXT_PROPERTY_LIST Context_GetProperties(void *context, size_t contextSize) +PCONTEXT_PROPERTY_LIST Context_GetProperties(const void *context, size_t contextSize) { PBASE_CONTEXT ptr = BASE_CONTEXT_FROM_CONTEXT(context, contextSize); diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c index ada06fc..9caf46d 100644 --- a/dlls/crypt32/crl.c +++ b/dlls/crypt32/crl.c @@ -266,10 +266,10 @@ DWORD WINAPI CertEnumCRLContextProperties(PCCRL_CONTEXT pCRLContext, return ret; } -static BOOL WINAPI CRLContext_SetProperty(void *context, DWORD dwPropId, - DWORD dwFlags, const void *pvData); +static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId, + DWORD dwFlags, const void *pvData); -static BOOL CRLContext_GetHashProp(void *context, DWORD dwPropId, +static BOOL CRLContext_GetHashProp(PCCRL_CONTEXT context, DWORD dwPropId, ALG_ID algID, const BYTE *toHash, DWORD toHashLen, void *pvData, DWORD *pcbData) { @@ -284,10 +284,9 @@ static BOOL CRLContext_GetHashProp(void *context, DWORD dwPropId, return ret; } -static BOOL WINAPI CRLContext_GetProperty(void *context, DWORD dwPropId, - void *pvData, DWORD *pcbData) +static BOOL CRLContext_GetProperty(PCCRL_CONTEXT context, DWORD dwPropId, + void *pvData, DWORD *pcbData) { - PCCRL_CONTEXT pCRLContext = (PCCRL_CONTEXT)context; PCONTEXT_PROPERTY_LIST properties = Context_GetProperties(context, sizeof(CRL_CONTEXT)); BOOL ret; @@ -322,12 +321,12 @@ static BOOL WINAPI CRLContext_GetProperty(void *context, DWORD dwPropId, { case CERT_SHA1_HASH_PROP_ID: ret = CRLContext_GetHashProp(context, dwPropId, CALG_SHA1, - pCRLContext->pbCrlEncoded, pCRLContext->cbCrlEncoded, pvData, + context->pbCrlEncoded, context->cbCrlEncoded, pvData, pcbData); break; case CERT_MD5_HASH_PROP_ID: ret = CRLContext_GetHashProp(context, dwPropId, CALG_MD5, - pCRLContext->pbCrlEncoded, pCRLContext->cbCrlEncoded, pvData, + context->pbCrlEncoded, context->cbCrlEncoded, pvData, pcbData); break; default: @@ -377,13 +376,13 @@ BOOL WINAPI CertGetCRLContextProperty(PCCRL_CONTEXT pCRLContext, } break; default: - ret = CRLContext_GetProperty((void *)pCRLContext, dwPropId, pvData, + ret = CRLContext_GetProperty(pCRLContext, dwPropId, pvData, pcbData); } return ret; } -static BOOL WINAPI CRLContext_SetProperty(void *context, DWORD dwPropId, +static BOOL CRLContext_SetProperty(PCCRL_CONTEXT context, DWORD dwPropId, DWORD dwFlags, const void *pvData) { PCONTEXT_PROPERTY_LIST properties = @@ -460,8 +459,7 @@ BOOL WINAPI CertSetCRLContextProperty(PCCRL_CONTEXT pCRLContext, SetLastError(E_INVALIDARG); return FALSE; } - ret = CRLContext_SetProperty((void *)pCRLContext, dwPropId, dwFlags, - pvData); + ret = CRLContext_SetProperty(pCRLContext, dwPropId, dwFlags, pvData); TRACE("returning %d\n", ret); return ret; } diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index c1009d6..18384dc 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -317,7 +317,7 @@ void Context_CopyProperties(const void *to, const void *from, /* Returns context's properties, or the linked context's properties if context * is a link context. */ -PCONTEXT_PROPERTY_LIST Context_GetProperties(void *context, size_t contextSize); +PCONTEXT_PROPERTY_LIST Context_GetProperties(const void *context, size_t contextSize); void Context_AddRef(void *context, size_t contextSize);

1 0

Gerald Pfeifer : d3d9/tests: Simplify condition in test_vshader_input().
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: a77249ad140153f0ae023a07e99fd59e76405e57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a77249ad140153f0ae023a07e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jan 1 12:36:36 2008 +0100 d3d9/tests: Simplify condition in test_vshader_input(). --- dlls/d3d9/tests/visual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 2700e73..4fae64b 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -5142,7 +5142,7 @@ void test_vshader_input(IDirect3DDevice9 *device) r = (color & 0x00ff0000) >> 16; g = (color & 0x0000ff00) >> 8; b = (color & 0x000000ff) >> 0; - ok(r >= 0xfe && r <= 0xff && g >= 0xfe && g <= 0xff && b >= 0x00 && b <= 0x01, + ok(r >= 0xfe && r <= 0xff && g >= 0xfe && g <= 0xff && b <= 0x01, "Input test: Quad 4(color-float) returned color 0x%08x, expected 0x00FFFF00\n", color); IDirect3DVertexShader9_Release(texcoord_color_shader);

1 0

Gerald Pfeifer : msi: Simplify condition in TABLE_fetch_stream().
by Alexandre Julliard Jan. 2, 2008

Jan. 2, 2008

Module: wine Branch: master Commit: f7fea9e9f0fde7c1e8928580f7a5bbb6501ccf35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7fea9e9f0fde7c1e8928580f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Jan 1 12:21:52 2008 +0100 msi: Simplify condition in TABLE_fetch_stream(). --- dlls/msi/table.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e5ad1af..42845d9 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1206,7 +1206,7 @@ static UINT TABLE_fetch_stream( struct tagMSIVIEW *view, UINT row, UINT col, ISt return r; /* check the column value is in range */ - if (ival < 0 || ival > tv->num_cols || ival == col) + if (ival > tv->num_cols || ival == col) { ERR("bad column ref (%u) for stream\n", ival); return ERROR_FUNCTION_FAILED;

1 0