November 2007 - Wine-Commits

Rob Shearman : comctl32: Update the version in the created version to the highest current version present on XP .
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: f2efcf5f5944bad25c7f94a808770d4a1f40eb21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2efcf5f5944bad25c7f94a80… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 22 19:09:27 2007 +0000 comctl32: Update the version in the created version to the highest current version present on XP. We don't need to create more than one because application dependencies can be resolved using shared assemblies with higher build and revision numbers. --- dlls/comctl32/commctrl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 0f8ad19..4604c0e 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -74,7 +74,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(commctrl); #define NAME "microsoft.windows.common-controls" #define FILE "comctl32.dll" -#define VERSION "6.0.0.0" +#define VERSION "6.0.2600.2982" #define PUBLIC_KEY "6595b64144ccf1df" #ifdef __i386__

1 0

Andrew Talbot : user32: Fix a typo.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 1818d3a2080f798aaec318618228acbaafd5bea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1818d3a2080f798aaec318618… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Nov 22 20:07:56 2007 +0000 user32: Fix a typo. --- dlls/user32/combo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 1709f28..b846618 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -774,7 +774,7 @@ static void CBPaintText( clipRegion=NULL; } - if (!IsWindowEnabled(lphc->self) & WS_DISABLED) itemState |= ODS_DISABLED; + if (!IsWindowEnabled(lphc->self)) itemState |= ODS_DISABLED; dis.CtlType = ODT_COMBOBOX; dis.CtlID = ctlid;

1 0

Rob Shearman : kernel32: Change the shared manifest test to depend on a build number that isn' t currently published on at least XP, showing that assemblies with higher build numbers can be used.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 361a98c5610543672bdfb0dd3eabc946497d620a URL: http://source.winehq.org/git/wine.git/?a=commit;h=361a98c5610543672bdfb0dd3… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 22 19:10:56 2007 +0000 kernel32: Change the shared manifest test to depend on a build number that isn't currently published on at least XP, showing that assemblies with higher build numbers can be used. --- dlls/kernel32/tests/actctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 643128d..40f8b6e 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -75,7 +75,7 @@ static const char manifest4[] = "<dependency>" "<dependentAssembly>" "<assemblyIdentity type=\"win32\" name=\"Microsoft.Windows.Common-Controls\" " - "version=\"6.0.0.0\" processorArchitecture=\"x86\" publicKeyToken=\"6595b64144ccf1df\">" + "version=\"6.0.1.0\" processorArchitecture=\"x86\" publicKeyToken=\"6595b64144ccf1df\">" "</assemblyIdentity>" "</dependentAssembly>" "</dependency>"

1 0

Rob Shearman : ntdll: Shared manifests should have a less-strict version check performed when loading them as dependencies .
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 542e10e44eae105d970bcfbf41362e3af417abb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=542e10e44eae105d970bcfbf4… Author: Rob Shearman <rob(a)codeweavers.com> Date: Tue Nov 20 13:46:43 2007 +0000 ntdll: Shared manifests should have a less-strict version check performed when loading them as dependencies. --- dlls/ntdll/actctx.c | 56 +++++++++++++++++++++++++++++++------------------- 1 files changed, 35 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index fe83be6..60128bc 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -144,7 +144,8 @@ struct dll_redirect enum assembly_type { APPLICATION_MANIFEST, - ASSEMBLY_MANIFEST + ASSEMBLY_MANIFEST, + ASSEMBLY_SHARED_MANIFEST, }; struct assembly @@ -1379,7 +1380,8 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, if (!parse_noinheritable_elem(xmlbuf) || !next_xml_elem(xmlbuf, &elem)) return FALSE; } - else if (assembly->type == ASSEMBLY_MANIFEST && assembly->no_inherit) + else if ((assembly->type == ASSEMBLY_MANIFEST || assembly->type == ASSEMBLY_SHARED_MANIFEST) && + assembly->no_inherit) return FALSE; if (xmlstr_cmp(&elem, assemblyIdentityW)) @@ -1393,7 +1395,17 @@ static BOOL parse_assembly_elem(xmlbuf_t* xmlbuf, struct actctx_loader* acl, if (assembly->type == ASSEMBLY_MANIFEST && memcmp(&assembly->id.version, &expected_ai->version, sizeof(assembly->id.version))) { - FIXME("wrong version\n"); + FIXME("wrong version for assembly manifest\n"); + return FALSE; + } + else if (assembly->type == ASSEMBLY_SHARED_MANIFEST && + (assembly->id.version.major != expected_ai->version.major || + assembly->id.version.minor != expected_ai->version.minor || + assembly->id.version.build < expected_ai->version.build || + (assembly->id.version.build == expected_ai->version.build && + assembly->id.version.revision < expected_ai->version.revision))) + { + FIXME("wrong version for shared assembly manifest\n"); return FALSE; } } @@ -1479,7 +1491,8 @@ static NTSTATUS parse_manifest_buffer( struct actctx_loader* acl, struct assembl } static NTSTATUS parse_manifest( struct actctx_loader* acl, struct assembly_identity* ai, - LPCWSTR filename, LPCWSTR directory, const void *buffer, SIZE_T size ) + LPCWSTR filename, LPCWSTR directory, BOOL shared, + const void *buffer, SIZE_T size ) { xmlbuf_t xmlbuf; NTSTATUS status; @@ -1488,7 +1501,7 @@ static NTSTATUS parse_manifest( struct actctx_loader* acl, struct assembly_ident TRACE( "parsing manifest loaded from %s base dir %s\n", debugstr_w(filename), debugstr_w(directory) ); - if (!(assembly = add_assembly(acl->actctx, ASSEMBLY_MANIFEST))) + if (!(assembly = add_assembly(acl->actctx, shared ? ASSEMBLY_SHARED_MANIFEST : ASSEMBLY_MANIFEST))) return STATUS_SXS_CANT_GEN_ACTCTX; if (directory && !(assembly->directory = strdupW(directory))) @@ -1580,8 +1593,8 @@ static NTSTATUS get_module_filename( HMODULE module, UNICODE_STRING *str, unsign } static NTSTATUS get_manifest_in_module( struct actctx_loader* acl, struct assembly_identity* ai, - LPCWSTR filename, LPCWSTR directory, HANDLE hModule, - LPCWSTR resname, ULONG lang ) + LPCWSTR filename, LPCWSTR directory, BOOL shared, + HANDLE hModule, LPCWSTR resname, ULONG lang ) { NTSTATUS status; UNICODE_STRING nameW; @@ -1630,14 +1643,14 @@ static NTSTATUS get_manifest_in_module( struct actctx_loader* acl, struct assemb if (status == STATUS_SUCCESS) status = LdrAccessResource(hModule, entry, &ptr, NULL); if (status == STATUS_SUCCESS) - status = parse_manifest(acl, ai, filename, directory, ptr, entry->Size); + status = parse_manifest(acl, ai, filename, directory, shared, ptr, entry->Size); return status; } static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assembly_identity* ai, - LPCWSTR filename, LPCWSTR directory, HANDLE file, - LPCWSTR resname, ULONG lang ) + LPCWSTR filename, LPCWSTR directory, BOOL shared, + HANDLE file, LPCWSTR resname, ULONG lang ) { HANDLE mapping; OBJECT_ATTRIBUTES attr; @@ -1672,7 +1685,7 @@ static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assem if (RtlImageNtHeader(base)) /* we got a PE file */ { HANDLE module = (HMODULE)((ULONG_PTR)base | 1); /* make it a LOAD_LIBRARY_AS_DATAFILE handle */ - status = get_manifest_in_module( acl, ai, filename, directory, module, resname, lang ); + status = get_manifest_in_module( acl, ai, filename, directory, shared, module, resname, lang ); } else status = STATUS_INVALID_IMAGE_FORMAT; @@ -1681,7 +1694,7 @@ static NTSTATUS get_manifest_in_pe_file( struct actctx_loader* acl, struct assem } static NTSTATUS get_manifest_in_manifest_file( struct actctx_loader* acl, struct assembly_identity* ai, - LPCWSTR filename, LPCWSTR directory, HANDLE file ) + LPCWSTR filename, LPCWSTR directory, BOOL shared, HANDLE file ) { FILE_END_OF_FILE_INFORMATION info; IO_STATUS_BLOCK io; @@ -1717,7 +1730,7 @@ static NTSTATUS get_manifest_in_manifest_file( struct actctx_loader* acl, struct status = NtQueryInformationFile( file, &io, &info, sizeof(info), FileEndOfFileInformation ); if (status == STATUS_SUCCESS) - status = parse_manifest(acl, ai, filename, directory, base, info.EndOfFile.QuadPart); + status = parse_manifest(acl, ai, filename, directory, shared, base, info.EndOfFile.QuadPart); NtUnmapViewOfSection( GetCurrentProcess(), base ); return status; @@ -1765,7 +1778,7 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl, if (!open_nt_file( &file, &nameW )) { - status = get_manifest_in_manifest_file( acl, ai, nameW.Buffer, directory, file ); + status = get_manifest_in_manifest_file( acl, ai, nameW.Buffer, directory, FALSE, file ); NtClose( file ); } else status = STATUS_RESOURCE_DATA_NOT_FOUND; @@ -1905,7 +1918,7 @@ static NTSTATUS lookup_winsxs(struct actctx_loader* acl, struct assembly_identit if (!open_nt_file( &handle, &path_us )) { - io.u.Status = get_manifest_in_manifest_file(acl, &sxs_ai, path_us.Buffer, file, handle); + io.u.Status = get_manifest_in_manifest_file(acl, &sxs_ai, path_us.Buffer, file, TRUE, handle); NtClose( handle ); } else io.u.Status = STATUS_NO_SUCH_FILE; @@ -1962,7 +1975,7 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, status = open_nt_file( &file, &nameW ); if (!status) { - status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, file, + status = get_manifest_in_pe_file( acl, ai, nameW.Buffer, directory, FALSE, file, (LPCWSTR)CREATEPROCESS_MANIFEST_RESOURCE_ID, 0 ); NtClose( file ); break; @@ -1976,7 +1989,7 @@ static NTSTATUS lookup_assembly(struct actctx_loader* acl, status = open_nt_file( &file, &nameW ); if (!status) { - status = get_manifest_in_manifest_file( acl, ai, nameW.Buffer, directory, file ); + status = get_manifest_in_manifest_file( acl, ai, nameW.Buffer, directory, FALSE, file ); NtClose( file ); break; } @@ -2230,7 +2243,7 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) /* if we have a resource it's a PE file */ if (pActCtx->dwFlags & ACTCTX_FLAG_HMODULE_VALID) { - status = get_manifest_in_module( &acl, NULL, NULL, directory, pActCtx->hModule, + status = get_manifest_in_module( &acl, NULL, NULL, directory, FALSE, pActCtx->hModule, pActCtx->lpResourceName, lang ); if (status && status != STATUS_SXS_CANT_GEN_ACTCTX) /* FIXME: what to do if pActCtx->lpSource is set */ @@ -2239,7 +2252,7 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) } else if (pActCtx->lpSource) { - status = get_manifest_in_pe_file( &acl, NULL, nameW.Buffer, directory, + status = get_manifest_in_pe_file( &acl, NULL, nameW.Buffer, directory, FALSE, file, pActCtx->lpResourceName, lang ); if (status && status != STATUS_SXS_CANT_GEN_ACTCTX) status = get_manifest_in_associated_manifest( &acl, NULL, nameW.Buffer, directory, @@ -2249,7 +2262,7 @@ NTSTATUS WINAPI RtlCreateActivationContext( HANDLE *handle, const void *ptr ) } else { - status = get_manifest_in_manifest_file( &acl, NULL, nameW.Buffer, directory, file ); + status = get_manifest_in_manifest_file( &acl, NULL, nameW.Buffer, directory, FALSE, file ); } if (file) NtClose( file ); @@ -2502,7 +2515,8 @@ NTSTATUS WINAPI RtlQueryInformationActivationContext( ULONG flags, HANDLE handle id_len = strlenW(assembly_id) + 1; if (assembly->directory) ad_len = strlenW(assembly->directory) + 1; - if (assembly->manifest.info && assembly->type == ASSEMBLY_MANIFEST) + if (assembly->manifest.info && + (assembly->type == ASSEMBLY_MANIFEST || assembly->type == ASSEMBLY_SHARED_MANIFEST)) path_len = strlenW(assembly->manifest.info) + 1; len = sizeof(*afdi) + (id_len + ad_len + path_len) * sizeof(WCHAR);

1 0

Rob Shearman : ole32: Fix a race in find_proxy_manager.
by Alexandre Julliard Nov. 26, 2007

Nov. 26, 2007

Module: wine Branch: master Commit: 6f917d49c1798eb7693c606c29fa1b65bce63171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f917d49c1798eb7693c606c2… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Nov 22 19:08:23 2007 +0000 ole32: Fix a race in find_proxy_manager. --- dlls/ole32/marshal.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index fcfbd64..fde189a 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -1097,10 +1097,15 @@ static BOOL find_proxy_manager(APARTMENT * apt, OXID oxid, OID oid, struct proxy struct proxy_manager * proxy = LIST_ENTRY(cursor, struct proxy_manager, entry); if ((oxid == proxy->oxid) && (oid == proxy->oid)) { - *proxy_found = proxy; - ClientIdentity_AddRef((IMultiQI *)&proxy->lpVtbl); - found = TRUE; - break; + /* be careful of a race with ClientIdentity_Release, which would + * cause us to return a proxy which is in the process of being + * destroyed */ + if (ClientIdentity_AddRef((IMultiQI *)&proxy->lpVtbl) != 0) + { + *proxy_found = proxy; + found = TRUE; + break; + } } } LeaveCriticalSection(&apt->cs);

1 0

daoo : Update CODING_STANDARDS
by Chris Morgan Nov. 25, 2007

Nov. 25, 2007

Module: appdb Branch: master Commit: 3a3863ccd269ad1bd7c5131ec383d0af21a6b743 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3a3863ccd269ad1bd7c5131e… Author: daoo <daoo90(a)gmail.com> Date: Fri Nov 23 22:18:36 2007 +0100 Update CODING_STANDARDS --- CODING_STANDARD | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/CODING_STANDARD b/CODING_STANDARD index bba722d..d4fac23 100644 --- a/CODING_STANDARD +++ b/CODING_STANDARD @@ -97,3 +97,20 @@ function bar() 3) always put a single space after the comment mark 4) never use # for commenting as it will become obsolete in the future + +/** + * string quotes + */ +There are two different ways to quote strings in PHP - single quotes or double quotes. +The difference is that the parser does variable interpolation in double-quoted strings, but not in single quoted strings. +Because of this, always use single quotes unless the string contains a variable that needs to be parsed. + +Also if the string contains a variable put it inside double quotes instead of using 'bla' . $var . 'bla'; +To increase readability of the code. +Wrong: +$str = "This is a long string without any variables"; +$str = 'This string contains a variable ' . $var . ' enough said.'; + +Right: +$str = 'This is a long string without any variables'; +$str = "This string contains a variable $var enough said";

1 0

Alexander Nicolaysen Sørnes : Remove deleteAny.php
by Chris Morgan Nov. 23, 2007

Nov. 23, 2007

Module: appdb Branch: master Commit: 30dc3d2b2c27b54d287db3b18dbc662863165324 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=30dc3d2b2c27b54d287db3b1… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Nov 24 02:30:25 2007 +0100 Remove deleteAny.php --- admin/deleteAny.php | 36 ------------------------------------ appbrowse.php | 1 - 2 files changed, 0 insertions(+), 37 deletions(-) diff --git a/admin/deleteAny.php b/admin/deleteAny.php deleted file mode 100644 index 2f146be..0000000 --- a/admin/deleteAny.php +++ /dev/null @@ -1,36 +0,0 @@ -<?php -/****************************************************/ -/* code to delete versions, families and categories */ -/****************************************************/ - -/* - * application environment - */ -require("path.php"); -require(BASE."include/incl.php"); -require_once(BASE."include/category.php"); -require_once(BASE."include/application.php"); -require_once(BASE."include/monitor.php"); -require_once(BASE."include/testData.php"); - -if($aClean['sConfirmed'] != "yes") -{ - // ask for confirmation - // could do some Real Damage if someone accidently hits the delete button on the main category :) - // - // perhaps we can do this with some javascript, popup - - util_show_error_page_and_exit("Not confirmed"); -} - -if(isset($aClean['sWhat']) && $aClean['sWhat'] == "category") -{ - // delete category and the apps in it - $oCategory = new Category($aClean['iCatId']); - if(!$oCategory->delete()) - util_show_error_page_and_exit(); - else - util_redirect_and_exit(BASE."appbrowse.php"); -} - -?> diff --git a/appbrowse.php b/appbrowse.php index b1e4401..e026e49 100644 --- a/appbrowse.php +++ b/appbrowse.php @@ -18,7 +18,6 @@ function admin_menu() $m = new htmlmenu("Admin"); $m->add('Edit this Category', BASE."objectManager.php?iId=${aClean[iCatId]}&sClass=category&sAction=edit"); - $url = BASE."admin/deleteAny.php?sWhat=category&iCatId=".$aClean['iCatId']."&sConfirmed=yes"; /* We only allow deletion of the category if it is empty */ $oCat = new category($aClean['iCatId']);

1 0

Alexander Nicolaysen Sørnes : Fix category administration
by Chris Morgan Nov. 23, 2007

Nov. 23, 2007

Module: appdb Branch: master Commit: 6ebd4cfa34bbacb681bb1c3ae2704d2136ccc554 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6ebd4cfa34bbacb681bb1c3a… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sat Nov 24 02:16:28 2007 +0100 Fix category administration --- admin/addCategory.php | 56 ----------------- appbrowse.php | 8 ++- include/category.php | 150 +++++++++++++++++++++++++++++++-------------- include/sidebar_admin.php | 2 +- include/user.php | 8 --- 5 files changed, 110 insertions(+), 114 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=6ebd4cfa34bbacb681bb…

1 0

Andrew Talbot : user32: Constify some variables.
by Alexandre Julliard Nov. 21, 2007

Nov. 21, 2007

Module: wine Branch: master Commit: 7a8eb4c5999120025a50b44eb1ba82861ba82ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8eb4c5999120025a50b44eb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Nov 20 20:54:25 2007 +0000 user32: Constify some variables. --- dlls/user32/listbox.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index 5d99670..d819684 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -131,7 +131,7 @@ static TIMER_DIRECTION LISTBOX_Timer = LB_TIMER_NONE; static LRESULT WINAPI ListBoxWndProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI ListBoxWndProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ); -static LRESULT LISTBOX_GetItemRect( LB_DESCR *descr, INT index, RECT *rect ); +static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ); /********************************************************************* * listbox class descriptor @@ -177,7 +177,7 @@ static inline BOOL is_old_app( LB_DESCR *descr ) * * Return the current page size */ -static INT LISTBOX_GetCurrentPageSize( LB_DESCR *descr ) +static INT LISTBOX_GetCurrentPageSize( const LB_DESCR *descr ) { INT i, height; if (!(descr->style & LBS_OWNERDRAWVARIABLE)) return descr->page_size; @@ -195,7 +195,7 @@ static INT LISTBOX_GetCurrentPageSize( LB_DESCR *descr ) * * Return the maximum possible index for the top of the listbox. */ -static INT LISTBOX_GetMaxTopIndex( LB_DESCR *descr ) +static INT LISTBOX_GetMaxTopIndex( const LB_DESCR *descr ) { INT max, page; @@ -432,7 +432,7 @@ static void LISTBOX_UpdateSize( LB_DESCR *descr ) * Get the rectangle enclosing an item, in listbox client coordinates. * Return 1 if the rectangle is (partially) visible, 0 if hidden, -1 on error. */ -static LRESULT LISTBOX_GetItemRect( LB_DESCR *descr, INT index, RECT *rect ) +static LRESULT LISTBOX_GetItemRect( const LB_DESCR *descr, INT index, RECT *rect ) { /* Index <= 0 is legal even on empty listboxes */ if (index && (index >= descr->nb_items)) @@ -490,7 +490,7 @@ static LRESULT LISTBOX_GetItemRect( LB_DESCR *descr, INT index, RECT *rect ) * * Return the item nearest from point (x,y) (in client coordinates). */ -static INT LISTBOX_GetItemFromPoint( LB_DESCR *descr, INT x, INT y ) +static INT LISTBOX_GetItemFromPoint( const LB_DESCR *descr, INT x, INT y ) { INT index = descr->top_item; @@ -999,10 +999,10 @@ static INT LISTBOX_FindString( LB_DESCR *descr, INT start, LPCWSTR str, BOOL exa /*********************************************************************** * LISTBOX_GetSelCount */ -static LRESULT LISTBOX_GetSelCount( LB_DESCR *descr ) +static LRESULT LISTBOX_GetSelCount( const LB_DESCR *descr ) { INT i, count; - LB_ITEMDATA *item = descr->items; + const LB_ITEMDATA *item = descr->items; if (!(descr->style & LBS_MULTIPLESEL) || (descr->style & LBS_NOSEL)) @@ -1016,10 +1016,10 @@ static LRESULT LISTBOX_GetSelCount( LB_DESCR *descr ) /*********************************************************************** * LISTBOX_GetSelItems16 */ -static LRESULT LISTBOX_GetSelItems16( LB_DESCR *descr, INT16 max, LPINT16 array ) +static LRESULT LISTBOX_GetSelItems16( const LB_DESCR *descr, INT16 max, LPINT16 array ) { INT i, count; - LB_ITEMDATA *item = descr->items; + const LB_ITEMDATA *item = descr->items; if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR; for (i = count = 0; (i < descr->nb_items) && (count < max); i++, item++) @@ -1031,10 +1031,10 @@ static LRESULT LISTBOX_GetSelItems16( LB_DESCR *descr, INT16 max, LPINT16 array /*********************************************************************** * LISTBOX_GetSelItems */ -static LRESULT LISTBOX_GetSelItems( LB_DESCR *descr, INT max, LPINT array ) +static LRESULT LISTBOX_GetSelItems( const LB_DESCR *descr, INT max, LPINT array ) { INT i, count; - LB_ITEMDATA *item = descr->items; + const LB_ITEMDATA *item = descr->items; if (!(descr->style & LBS_MULTIPLESEL)) return LB_ERR; for (i = count = 0; (i < descr->nb_items) && (count < max); i++, item++) @@ -1200,7 +1200,7 @@ static void LISTBOX_InvalidateItemRect( LB_DESCR *descr, INT index ) /*********************************************************************** * LISTBOX_GetItemHeight */ -static LRESULT LISTBOX_GetItemHeight( LB_DESCR *descr, INT index ) +static LRESULT LISTBOX_GetItemHeight( const LB_DESCR *descr, INT index ) { if (descr->style & LBS_OWNERDRAWVARIABLE && descr->nb_items > 0) {

1 0

Alexandre Julliard : wsock32: Forward AcceptEx and GetAcceptExSockaddrs to mswsock.
by Alexandre Julliard Nov. 21, 2007

Nov. 21, 2007

Module: wine Branch: master Commit: 029a74e56e6d570e3a7e64b99bac886b41c51a09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=029a74e56e6d570e3a7e64b99… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 21 13:23:04 2007 +0100 wsock32: Forward AcceptEx and GetAcceptExSockaddrs to mswsock. --- dlls/wsock32/Makefile.in | 2 +- dlls/wsock32/wsock32.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wsock32/Makefile.in b/dlls/wsock32/Makefile.in index 0fbb83f..46af82b 100644 --- a/dlls/wsock32/Makefile.in +++ b/dlls/wsock32/Makefile.in @@ -4,7 +4,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = wsock32.dll IMPORTLIB = libwsock32.$(IMPLIBEXT) -IMPORTS = ws2_32 iphlpapi kernel32 +IMPORTS = mswsock ws2_32 iphlpapi kernel32 C_SRCS = \ protocol.c \ diff --git a/dlls/wsock32/wsock32.spec b/dlls/wsock32/wsock32.spec index 620abb1..3a4b32a 100644 --- a/dlls/wsock32/wsock32.spec +++ b/dlls/wsock32/wsock32.spec @@ -74,5 +74,5 @@ 1120 stdcall GetServiceW(long ptr ptr long ptr ptr ptr) #1130 stub NPLoadNameSpaces 1140 stub TransmitFile -1141 stub AcceptEx -1142 stub GetAcceptExSockaddrs +1141 stdcall AcceptEx(long long ptr long long long ptr ptr) mswsock.AcceptEx +1142 stdcall GetAcceptExSockaddrs(ptr long long long ptr ptr ptr ptr) mswsock.GetAcceptExSockaddrs

1 0