May 2009 - Wine-commits - list.winehq.org

Juan Lang : inetmib1: Make sure the successor to an item doesn' t have an identical key as it, to prevent infinite loops in table enumeration.
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: 9b65338ef9980a562197e3513ab009b0b133ae4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b65338ef9980a562197e3513… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed May 13 12:36:42 2009 -0700 inetmib1: Make sure the successor to an item doesn't have an identical key as it, to prevent infinite loops in table enumeration. --- dlls/inetmib1/main.c | 78 +++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 67 insertions(+), 11 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index 91f5fd5..a6995ff 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -323,7 +323,27 @@ static DWORD oidToIpAddr(AsnObjectIdentifier *oid) typedef void (*oidToKeyFunc)(AsnObjectIdentifier *oid, void *dst); typedef int (*compareFunc)(const void *key, const void *value); -static UINT findValueInTable(AsnObjectIdentifier *oid, +/* Finds the first value in the table that matches key. Returns its 1-based + * index if found, or 0 if not found. + */ +static UINT findValueInTable(const void *key, + struct GenericTable *table, size_t tableEntrySize, compareFunc compare) +{ + UINT index = 0; + void *value; + + value = bsearch(key, table->entries, table->numEntries, tableEntrySize, + compare); + if (value) + index = ((BYTE *)value - (BYTE *)table->entries) / tableEntrySize + 1; + return index; +} + +/* Finds the first value in the table that matches oid, using makeKey to + * convert the oid to a key for comparison. Returns the value's 1-based + * index if found, or 0 if not found. + */ +static UINT findOidInTable(AsnObjectIdentifier *oid, struct GenericTable *table, size_t tableEntrySize, oidToKeyFunc makeKey, compareFunc compare) { @@ -332,14 +352,50 @@ static UINT findValueInTable(AsnObjectIdentifier *oid, if (key) { - void *value; + makeKey(oid, key); + index = findValueInTable(key, table, tableEntrySize, compare); + HeapFree(GetProcessHeap(), 0, key); + } + return index; +} + +/* Finds the first successor to the value in the table that does matches oid, + * using makeKey to convert the oid to a key for comparison. A successor is + * a value that does not match oid, so if multiple entries match an oid, only + * the first will ever be returned using this method. + * Returns the successor's 1-based index if found, or 0 if not found. + */ +static UINT findNextOidInTable(AsnObjectIdentifier *oid, + struct GenericTable *table, size_t tableEntrySize, oidToKeyFunc makeKey, + compareFunc compare) +{ + UINT index = 0; + void *key = HeapAlloc(GetProcessHeap(), 0, tableEntrySize); + if (key) + { makeKey(oid, key); - value = bsearch(key, table->entries, table->numEntries, tableEntrySize, - compare); - if (value) - index = ((BYTE *)value - (BYTE *)table->entries) / tableEntrySize - + 1; + index = findValueInTable(key, table, tableEntrySize, compare); + if (index == 0) + { + /* Not found in table. If it's less than the first entry, return + * the first index. Otherwise just return 0 and let the caller + * handle finding the successor. + */ + if (compare(key, table->entries) < 0) + index = 1; + } + else + { + /* Skip any entries that match the same key. This enumeration will + * be incomplete, but it's what Windows appears to do if there are + * multiple entries with the same index in a table, and it avoids + * an infinite loop. + */ + for (++index; index <= table->numEntries && compare(key, + &table->entries[tableEntrySize * index]) == 0; ++index) + ; + } HeapFree(GetProcessHeap(), 0, key); } return index; @@ -403,9 +459,9 @@ static AsnInteger32 getItemAndInstanceFromTable(AsnObjectIdentifier *oid, AsnObjectIdentifier ipOid = { instanceLen, oid->ids + base->idLength + 1 }; - *instance = findValueInTable(&ipOid, table, tableEntrySize, - makeKey, compare) + 1; - if (*instance > table->numEntries) + *instance = findNextOidInTable(&ipOid, table, tableEntrySize, + makeKey, compare); + if (!*instance || *instance > table->numEntries) ret = SNMP_ERRORSTATUS_NOSUCHNAME; } } @@ -424,7 +480,7 @@ static AsnInteger32 getItemAndInstanceFromTable(AsnObjectIdentifier *oid, AsnObjectIdentifier ipOid = { instanceLen, oid->ids + base->idLength + 1 }; - *instance = findValueInTable(&ipOid, table, tableEntrySize, + *instance = findOidInTable(&ipOid, table, tableEntrySize, makeKey, compare); if (!*instance) ret = SNMP_ERRORSTATUS_NOSUCHNAME;

1 0

Juan Lang : inetmib1: Don' t query the same OID twice if it returns SNMP_ERRORSTATUS_NOSUCHNAME the first time .
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: f95324c69e2f80c8ee571b376c7318e7007e31b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f95324c69e2f80c8ee571b376… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu May 14 09:05:31 2009 -0700 inetmib1: Don't query the same OID twice if it returns SNMP_ERRORSTATUS_NOSUCHNAME the first time. --- dlls/inetmib1/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/inetmib1/main.c b/dlls/inetmib1/main.c index a6995ff..7ce0111 100644 --- a/dlls/inetmib1/main.c +++ b/dlls/inetmib1/main.c @@ -1371,7 +1371,7 @@ BOOL WINAPI SnmpExtensionQuery(BYTE bPduType, SnmpVarBindList *pVarBindList, * so we have to continue until an implementation handles the * query or we exhaust the table of supported OIDs. */ - for (; error == SNMP_ERRORSTATUS_NOSUCHNAME && + for (matchingIndex++; error == SNMP_ERRORSTATUS_NOSUCHNAME && matchingIndex < DEFINE_SIZEOF(supportedIDs); matchingIndex++) {

1 0

Marcus Meissner : urlmon: Separate NULL ptr check (Coverity 924).
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: bbac7d9fb43bdb57b3a4c9d8b37ed8ba793023a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbac7d9fb43bdb57b3a4c9d8b… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri May 15 09:44:34 2009 +0200 urlmon: Separate NULL ptr check (Coverity 924). --- dlls/urlmon/bindprot.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index d431095..7231ae6 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -171,7 +171,10 @@ void release_notif_hwnd(HWND hwnd) { tls_data_t *data = get_tls_data(); - if(!data || data->notif_hwnd != hwnd) { + if(!data) + return; + + if(data->notif_hwnd != hwnd) { PostMessageW(data->notif_hwnd, WM_MK_RELEASE, 0, 0); return; }

1 0

Francois Gouget : riched20: ME_MakeString() is unused so remove it.
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: 61a8b94634375e3aeaf56fe7a85b0a404262511b URL: http://source.winehq.org/git/wine.git/?a=commit;h=61a8b94634375e3aeaf56fe7a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 15 01:50:06 2009 +0200 riched20: ME_MakeString() is unused so remove it. --- dlls/riched20/editor.h | 1 - dlls/riched20/string.c | 5 ----- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 77b33d2..8568420 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -86,7 +86,6 @@ void ME_DumpDocument(ME_TextBuffer *buffer); const char *ME_GetDITypeName(ME_DIType type); /* string.c */ -ME_String *ME_MakeString(LPCWSTR szText); ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars); ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars); ME_String *ME_StrDup(const ME_String *s); diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 128e3c2..db45d92 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -49,11 +49,6 @@ ME_String *ME_MakeStringN(LPCWSTR szText, int nMaxChars) return s; } -ME_String *ME_MakeString(LPCWSTR szText) -{ - return ME_MakeStringN(szText, lstrlenW(szText)); -} - /* Make a string by repeating a char nMaxChars times */ ME_String *ME_MakeStringR(WCHAR cRepeat, int nMaxChars) {

1 0

Francois Gouget : dplayx: NS_GetOtherMagic() is not used, so remove it.
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: 6512ed52712b02d51c2a176e0201d6af2c837b8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6512ed52712b02d51c2a176e0… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 15 01:51:07 2009 +0200 dplayx: NS_GetOtherMagic() is not used, so remove it. --- dlls/dplayx/dplayx_messages.c | 4 ---- dlls/dplayx/name_server.c | 8 -------- dlls/dplayx/name_server.h | 1 - 3 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/dplayx/dplayx_messages.c b/dlls/dplayx/dplayx_messages.c index 181e6b0..2e34950 100644 --- a/dlls/dplayx/dplayx_messages.c +++ b/dlls/dplayx/dplayx_messages.c @@ -329,11 +329,7 @@ HRESULT DP_MSG_ForwardPlayerCreation( IDirectPlay2AImpl* This, DPID dpidServer ) lpMsgBody->unknown4[5] = 0x0; lpMsgBody->unknown4[6] = 0x0; -#if 0 - lpMsgBody->unknown4[7] = NS_GetOtherMagic( This->dp2->lpNameServerData ) -#else lpMsgBody->unknown4[7] = NS_GetNsMagic( This->dp2->lpNameServerData ); -#endif TRACE( "Setting second magic to 0x%08x\n", lpMsgBody->unknown4[7] ); lpMsgBody->unknown4[8] = 0x0; diff --git a/dlls/dplayx/name_server.c b/dlls/dplayx/name_server.c index e6a6b62..58402cc 100644 --- a/dlls/dplayx/name_server.c +++ b/dlls/dplayx/name_server.c @@ -183,14 +183,6 @@ DWORD NS_GetNsMagic( LPVOID lpNSInfo ) return lpHdrInfo[1]; } -/* Get the magic number associated with the non NS end */ -DWORD NS_GetOtherMagic( LPVOID lpNSInfo ) -{ - lpNSCache lpCache = (lpNSCache)lpNSInfo; - - return ((LPDWORD)lpCache->lpLocalAddrHdr)[1]; -} - void NS_SetLocalAddr( LPVOID lpNSInfo, LPCVOID lpHdr, DWORD dwHdrSize ) { lpNSCache lpCache = (lpNSCache)lpNSInfo; diff --git a/dlls/dplayx/name_server.h b/dlls/dplayx/name_server.h index 9c09ec6..c9df0c0 100644 --- a/dlls/dplayx/name_server.h +++ b/dlls/dplayx/name_server.h @@ -35,7 +35,6 @@ void NS_AddRemoteComputerAsNameServer( LPCVOID lpNSAddrHdr, LPVOID lpNSInfo ); LPVOID NS_GetNSAddr( LPVOID lpNSInfo ); DWORD NS_GetNsMagic( LPVOID lpNSInfo ); -DWORD NS_GetOtherMagic( LPVOID lpNSInfo ); void NS_SetLocalAddr( LPVOID lpNSInfo, LPCVOID lpHdr, DWORD dwHdrSize ); void NS_ReplyToEnumSessionsRequest( LPCVOID lpcMsg,

1 0

Francois Gouget : dplayx: Reorder the code to avoid forward declarations.
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: f80187f1f9fe0f0132d532dab2f8310ef2e78218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f80187f1f9fe0f0132d532dab… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 15 01:55:28 2009 +0200 dplayx: Reorder the code to avoid forward declarations. --- dlls/dplayx/dplayx_global.c | 700 +++++++++++++++++++++---------------------- 1 files changed, 343 insertions(+), 357 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f80187f1f9fe0f0132d53…

1 0

Francois Gouget : fusion: assembly_get_architecture() is unused so remove it.
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: d26d99714cc37b59f436a3d94b9cfe679c7fe660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d26d99714cc37b59f436a3d94… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri May 15 02:01:29 2009 +0200 fusion: assembly_get_architecture() is unused so remove it. --- dlls/fusion/assembly.c | 6 ------ dlls/fusion/fusionpriv.h | 1 - 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/fusion/assembly.c b/dlls/fusion/assembly.c index faef8ef..bc187ac 100644 --- a/dlls/fusion/assembly.c +++ b/dlls/fusion/assembly.c @@ -811,12 +811,6 @@ HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version) return S_OK; } -HRESULT assembly_get_architecture(ASSEMBLY *assembly, DWORD fixme) -{ - /* FIXME */ - return S_OK; -} - static BYTE *assembly_get_blob(ASSEMBLY *assembly, WORD index, ULONG *size) { return GetData(&assembly->blobs[index], size); diff --git a/dlls/fusion/fusionpriv.h b/dlls/fusion/fusionpriv.h index 363d530..4b9bd57 100644 --- a/dlls/fusion/fusionpriv.h +++ b/dlls/fusion/fusionpriv.h @@ -433,7 +433,6 @@ HRESULT assembly_release(ASSEMBLY *assembly); HRESULT assembly_get_name(ASSEMBLY *assembly, LPWSTR *name); HRESULT assembly_get_path(ASSEMBLY *assembly, LPWSTR *path); HRESULT assembly_get_version(ASSEMBLY *assembly, LPWSTR *version); -HRESULT assembly_get_architecture(ASSEMBLY *assembly, DWORD fixme); HRESULT assembly_get_pubkey_token(ASSEMBLY *assembly, LPWSTR *token); static inline LPWSTR strdupW(LPCWSTR src)

1 0

Alexandre Julliard : mlang: Return the correct count in IMLangFontLink_GetStrCodePages when aborting early .
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: 2a48ef1d0996cfaed55ff7a3c334581a7f33d334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a48ef1d0996cfaed55ff7a3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 14 20:09:53 2009 +0200 mlang: Return the correct count in IMLangFontLink_GetStrCodePages when aborting early. --- dlls/mlang/mlang.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index d627cfd..5deb87b 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -1939,7 +1939,7 @@ static HRESULT WINAPI fnIMLangFontLink_GetStrCodePages( } if (pdwCodePages) *pdwCodePages = cps; - if (pcchCodePages) *pcchCodePages = i; + if (pcchCodePages) *pcchCodePages = min( i + 1, cchSrc ); return S_OK; }

1 0

Henri Verbeet : wined3d: Add missing GL locking to d3dfmt_p8_upload_palette ().
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: 5bc449553b376a1cc347b6f7c09a7a5298c03ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc449553b376a1cc347b6f7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 14 19:40:55 2009 +0200 wined3d: Add missing GL locking to d3dfmt_p8_upload_palette(). --- dlls/wined3d/surface.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 58081cb..f4463e3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2263,7 +2263,9 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve if(GL_SUPPORT(EXT_PALETTED_TEXTURE)) { TRACE("Using GL_EXT_PALETTED_TEXTURE for 8-bit paletted texture support\n"); + ENTER_GL(); GL_EXTCALL(glColorTableEXT(This->glDescription.target,GL_RGBA,256,GL_RGBA,GL_UNSIGNED_BYTE, table)); + LEAVE_GL(); } else { @@ -2271,6 +2273,8 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve * The 8bit pixel data will be used as an index in this palette texture to retrieve the final color. */ TRACE("Using fragment shaders for emulating 8-bit paletted texture support\n"); + ENTER_GL(); + /* Create the fragment program if we don't have it */ if(!device->paletteConversionShader) { @@ -2310,6 +2314,8 @@ static void d3dfmt_p8_upload_palette(IWineD3DSurface *iface, CONVERT_TYPES conve /* Rebind the texture because it isn't bound anymore */ glBindTexture(This->glDescription.target, This->glDescription.textureName); + + LEAVE_GL(); } }

1 0

Henri Verbeet : wined3d: Add missing GL locking to ffp_blit_set() and ffp_blit_unset().
by Alexandre Julliard 15 May '09

15 May '09

Module: wine Branch: master Commit: 177d883d95068023975019e96348bfde2349d640 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177d883d95068023975019e96… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 14 19:40:55 2009 +0200 wined3d: Add missing GL locking to ffp_blit_set() and ffp_blit_unset(). --- dlls/wined3d/surface.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f4463e3..a33bd6d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4853,13 +4853,16 @@ static void ffp_blit_free(IWineD3DDevice *iface) { } static HRESULT ffp_blit_set(IWineD3DDevice *iface, const struct GlPixelFormatDesc *format_desc, GLenum textype, UINT width, UINT height) { + ENTER_GL(); glEnable(textype); checkGLcall("glEnable(textype)"); + LEAVE_GL(); return WINED3D_OK; } static void ffp_blit_unset(IWineD3DDevice *iface) { IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *) iface; + ENTER_GL(); glDisable(GL_TEXTURE_2D); checkGLcall("glDisable(GL_TEXTURE_2D)"); if(GL_SUPPORT(ARB_TEXTURE_CUBE_MAP)) { @@ -4870,6 +4873,7 @@ static void ffp_blit_unset(IWineD3DDevice *iface) { glDisable(GL_TEXTURE_RECTANGLE_ARB); checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)"); } + LEAVE_GL(); } static BOOL ffp_blit_color_fixup_supported(struct color_fixup_desc fixup)

1 0