June 2007 - Wine-commits - list.winehq.org

Huw Davies : winex11.drv: XRenderCompositeText has a problem with 0x0 glyphs, so we'll pretend they' re 1x1.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: c9fd5a265f4b1f9a52ba27d8f30ddf855aeba55c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9fd5a265f4b1f9a52ba27d8f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 6 15:20:16 2007 +0100 winex11.drv: XRenderCompositeText has a problem with 0x0 glyphs, so we'll pretend they're 1x1. --- dlls/winex11.drv/xrender.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 612c048..74a7e2b 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -633,6 +633,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) gsCacheEntryFormat *formatEntry; UINT ggo_format = GGO_GLYPH_INDEX; XRenderPictFormat pf; + const char zero = 0; switch(format) { case AA_Grey: @@ -790,7 +791,6 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) } } - memcpy(&formatEntry->gis[glyph], &gi, sizeof(gi)); if(formatEntry->glyphset) { if(format == AA_None && BitmapBitOrder(gdi_display) != MSBFirst) { @@ -809,14 +809,28 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) } } gid = glyph; + + /* + XRenderCompositeText seems to ignore 0x0 glyphs when + AA_None, which means we lose the advance width of glyphs + like the space. We'll pretend that such glyphs are 1x1 + bitmaps. + */ + + if(buflen == 0) + gi.width = gi.height = 1; + wine_tsx11_lock(); pXRenderAddGlyphs(gdi_display, formatEntry->glyphset, &gid, &gi, 1, - buf, buflen); + buflen ? buf : &zero, buflen ? buflen : 1); wine_tsx11_unlock(); HeapFree(GetProcessHeap(), 0, buf); } else { formatEntry->bitmaps[glyph] = buf; } + + memcpy(&formatEntry->gis[glyph], &gi, sizeof(gi)); + return TRUE; }

1 0

Alexandre Julliard : server: Add support for system processes, that can be signaled to exit when all non-system processes are done.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 156b205eb527b57d6e9e9e859df77a42c2104603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=156b205eb527b57d6e9e9e859… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 6 20:33:13 2007 +0200 server: Add support for system processes, that can be signaled to exit when all non-system processes are done. --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/process.c | 18 ++++++++++++++++++ include/wine/server_protocol.h | 17 ++++++++++++++++- server/process.c | 40 ++++++++++++++++++++++++++++++++++++++-- server/process.h | 1 + server/protocol.def | 7 +++++++ server/request.h | 2 ++ server/trace.c | 12 ++++++++++++ 8 files changed, 95 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 535f375..b2b0cc0 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1380,6 +1380,7 @@ @ cdecl wine_server_handle_to_fd(long long ptr ptr) @ cdecl wine_server_release_fd(long long) @ cdecl wine_server_send_fd(long) +@ cdecl __wine_make_process_system() # Codepages @ cdecl __wine_init_codepages(ptr ptr ptr) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 724c081..b059c94 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -71,6 +71,24 @@ PEB * WINAPI RtlGetCurrentPeb(void) return NtCurrentTeb()->Peb; } +/*********************************************************************** + * __wine_make_process_system (NTDLL.@) + * + * Mark the current process as a system process. + * Returns the event that is signaled when all non-system processes have exited. + */ +HANDLE __wine_make_process_system(void) +{ + HANDLE ret = 0; + SERVER_START_REQ( make_process_system ) + { + if (!wine_server_call( req )) ret = reply->event; + } + SERVER_END_REQ; + return ret; +} + + #define UNIMPLEMENTED_INFO_CLASS(c) \ case c: \ FIXME("(process=%p) Unimplemented information class: " #c "\n", ProcessHandle); \ diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 6b703a1..56574b0 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -4054,6 +4054,18 @@ struct get_next_device_request_reply }; + +struct make_process_system_request +{ + struct request_header __header; +}; +struct make_process_system_reply +{ + struct reply_header __header; + obj_handle_t event; +}; + + enum request { REQ_new_process, @@ -4275,6 +4287,7 @@ enum request REQ_create_device, REQ_delete_device, REQ_get_next_device_request, + REQ_make_process_system, REQ_NB_REQUESTS }; @@ -4501,6 +4514,7 @@ union generic_request struct create_device_request create_device_request; struct delete_device_request delete_device_request; struct get_next_device_request_request get_next_device_request_request; + struct make_process_system_request make_process_system_request; }; union generic_reply { @@ -4725,8 +4739,9 @@ union generic_reply struct create_device_reply create_device_reply; struct delete_device_reply delete_device_reply; struct get_next_device_request_reply get_next_device_request_reply; + struct make_process_system_reply make_process_system_reply; }; -#define SERVER_PROTOCOL_VERSION 305 +#define SERVER_PROTOCOL_VERSION 306 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index d733031..623d2ae 100644 --- a/server/process.c +++ b/server/process.c @@ -52,7 +52,8 @@ /* process structure */ static struct list process_list = LIST_INIT(process_list); -static int running_processes; +static int running_processes, user_processes; +static struct event *user_process_event; /* signaled when all user processes have exited */ /* process operations */ @@ -224,6 +225,11 @@ static void set_process_startup_state( struct process *process, enum startup_sta static void process_died( struct process *process ) { if (debug_level) fprintf( stderr, "%04x: *process killed*\n", process->id ); + if (!process->is_system) + { + if (!--user_processes && user_process_event) + set_event( user_process_event ); + } release_object( process ); if (!--running_processes) close_master_socket(); } @@ -272,6 +278,7 @@ struct thread *create_process( int fd, struct thread *parent_thread, int inherit process->priority = PROCESS_PRIOCLASS_NORMAL; process->affinity = 1; process->suspend = 0; + process->is_system = 0; process->create_flags = 0; process->console = NULL; process->startup_state = STARTUP_IN_PROGRESS; @@ -616,7 +623,15 @@ static void process_killed( struct process *process ) void add_process_thread( struct process *process, struct thread *thread ) { list_add_tail( &process->thread_list, &thread->proc_entry ); - if (!process->running_threads++) running_processes++; + if (!process->running_threads++) + { + running_processes++; + if (!process->is_system) + { + if (!user_processes++ && user_process_event) + reset_event( user_process_event ); + } + } grab_object( thread ); } @@ -1143,3 +1158,24 @@ DECL_HANDLER(get_process_idle_event) release_object( process ); } } + +/* make the current process a system process */ +DECL_HANDLER(make_process_system) +{ + struct process *process = current->process; + + if (!user_process_event) + { + if (!(user_process_event = create_event( NULL, NULL, 0, 1, 0 ))) return; + make_object_static( (struct object *)user_process_event ); + } + + if (!(reply->event = alloc_handle( current->process, user_process_event, EVENT_ALL_ACCESS, 0 ))) + return; + + if (!process->is_system) + { + process->is_system = 1; + if (!--user_processes) set_event( user_process_event ); + } +} diff --git a/server/process.h b/server/process.h index b2a6849..3054943 100644 --- a/server/process.h +++ b/server/process.h @@ -66,6 +66,7 @@ struct process int priority; /* priority class */ int affinity; /* process affinity mask */ int suspend; /* global process suspend count */ + int is_system; /* is it a system process? */ unsigned int create_flags; /* process creation flags */ struct list locks; /* list of file locks owned by the process */ struct list classes; /* window classes owned by the process */ diff --git a/server/protocol.def b/server/protocol.def index 8a7e5a8..df6b8d3 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2912,3 +2912,10 @@ enum message_type data_size_t out_size; /* needed output size */ VARARG(next_data,bytes); /* input data of the next ioctl */ @END + + +/* Make the current process a system process */ +(a)REQ(make_process_system) +(a)REPLY + obj_handle_t event; /* event signaled when all user processes have exited */ +(a)END diff --git a/server/request.h b/server/request.h index 90a0c6c..10b6cbe 100644 --- a/server/request.h +++ b/server/request.h @@ -329,6 +329,7 @@ DECL_HANDLER(create_device_manager); DECL_HANDLER(create_device); DECL_HANDLER(delete_device); DECL_HANDLER(get_next_device_request); +DECL_HANDLER(make_process_system); #ifdef WANT_REQUEST_HANDLERS @@ -554,6 +555,7 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_create_device, (req_handler)req_delete_device, (req_handler)req_get_next_device_request, + (req_handler)req_make_process_system, }; #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/trace.c b/server/trace.c index a340bad..312b68d 100644 --- a/server/trace.c +++ b/server/trace.c @@ -3530,6 +3530,15 @@ static void dump_get_next_device_request_reply( const struct get_next_device_req dump_varargs_bytes( cur_size ); } +static void dump_make_process_system_request( const struct make_process_system_request *req ) +{ +} + +static void dump_make_process_system_reply( const struct make_process_system_reply *req ) +{ + fprintf( stderr, " event=%p", req->event ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_get_new_process_info_request, @@ -3750,6 +3759,7 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_device_request, (dump_func)dump_delete_device_request, (dump_func)dump_get_next_device_request_request, + (dump_func)dump_make_process_system_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -3972,6 +3982,7 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_create_device_reply, (dump_func)0, (dump_func)dump_get_next_device_request_reply, + (dump_func)dump_make_process_system_reply, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -4194,6 +4205,7 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "create_device", "delete_device", "get_next_device_request", + "make_process_system", }; static const struct

1 0

Alexandre Julliard : explorer.exe: Mark explorer as a system process.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: d45450deaf72c68738b2740d9d4e7ff0f44e801e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d45450deaf72c68738b2740d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 6 20:33:22 2007 +0200 explorer.exe: Mark explorer as a system process. --- programs/explorer/desktop.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 0846dcd..7f2e23f 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -31,6 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(explorer); #define DESKTOP_CLASS_ATOM ((LPCWSTR)MAKEINTATOM(32769)) #define DESKTOP_ALL_ACCESS 0x01ff +extern HANDLE __wine_make_process_system(void); + static BOOL using_root; /* window procedure for the desktop window */ @@ -198,6 +200,10 @@ void manage_desktop( char *arg ) /* run the desktop message loop */ if (hwnd) { + /* we don't use the system process event, the server + * posts a WM_CLOSE when the last desktop user is gone */ + CloseHandle( __wine_make_process_system() ); + WINE_TRACE( "desktop message loop starting on hwnd %p\n", hwnd ); while (GetMessageW( &msg, 0, 0, 0 )) DispatchMessageW( &msg ); WINE_TRACE( "desktop message loop exiting for hwnd %p\n", hwnd );

1 0

Alexandre Julliard : advapi32: Mark service processes as system processes, and exit when all user processes are done.
by Alexandre Julliard 07 Jun '07

07 Jun '07

Module: wine Branch: master Commit: 9aa4235117455ce02c0089e3df0d7566112e4fab URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aa4235117455ce02c0089e3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 6 20:33:30 2007 +0200 advapi32: Mark service processes as system processes, and exit when all user processes are done. --- dlls/advapi32/service.c | 27 ++++++++++++++++++++++++--- 1 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/service.c b/dlls/advapi32/service.c index 7752b02..4808db1 100644 --- a/dlls/advapi32/service.c +++ b/dlls/advapi32/service.c @@ -89,6 +89,8 @@ static CRITICAL_SECTION service_cs = { &service_cs_debug, -1, 0, 0, 0, 0 }; static struct list service_list = LIST_INIT(service_list); +extern HANDLE __wine_make_process_system(void); + /****************************************************************************** * SC_HANDLEs */ @@ -774,18 +776,37 @@ static BOOL service_run_threads(void) TRACE("starting %d pipe listener threads\n", count); - handles = HeapAlloc(GetProcessHeap(), 0, sizeof(HANDLE)*count); + handles = HeapAlloc(GetProcessHeap(), 0, sizeof(HANDLE) * (count + 1)); + + handles[n++] = __wine_make_process_system(); LIST_FOR_EACH_ENTRY( service, &service_list, service_data, entry ) handles[n++] = CreateThread( NULL, 0, service_control_dispatcher, service, 0, NULL ); - assert(n==count); + assert(n == count + 1); LeaveCriticalSection( &service_cs ); /* wait for all the threads to pack up and exit */ - WaitForMultipleObjectsEx(count, handles, TRUE, INFINITE, FALSE); + while (n > 1) + { + DWORD ret = WaitForMultipleObjects( min(n,MAXIMUM_WAIT_OBJECTS), handles, FALSE, INFINITE ); + if (!ret) /* system process event */ + { + TRACE( "last user process exited, shutting down\n" ); + /* FIXME: we should maybe send a shutdown control to running services */ + ExitProcess(0); + } + if (ret < MAXIMUM_WAIT_OBJECTS) + { + CloseHandle( handles[ret] ); + memmove( &handles[ret], &handles[ret+1], (n - ret - 1) * sizeof(HANDLE) ); + n--; + } + else break; + } + while (n) CloseHandle( handles[--n] ); HeapFree(GetProcessHeap(), 0, handles); return TRUE;

1 0

appdb/include util.php
by WineHQ 07 Jun '07

07 Jun '07

ChangeSet ID: 31162 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/06 21:43:57 Modified files: include : util.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Programmatically fix up the bugzilla versions list. Sort the versions with the newest version first, limit the total number of versions to 6 by truncating the array and manually add the 'CVS' entry since we trim this entry off. This should make it easier for users to figure out which version to pick. Patch: http://cvs.winehq.org/patch.py?id=31162 Old revision New revision Changes Path 1.88 1.89 +39 -12 appdb/include/util.php Index: appdb/include/util.php diff -u -p appdb/include/util.php:1.88 appdb/include/util.php:1.89 --- appdb/include/util.php:1.88 7 Jun 2007 2:43:57 -0000 +++ appdb/include/util.php 7 Jun 2007 2:43:57 -0000 @@ -164,25 +164,52 @@ function make_bugzilla_version_list($var { $table = BUGZILLA_DB.".versions"; $where = "WHERE product_id=".BUGZILLA_PRODUCT_ID; - $sQuery = "SELECT value FROM $table $where ORDER BY value"; + $sQuery = "SELECT value FROM $table $where"; $hResult = query_bugzilladb($sQuery); if(!$hResult) return; + // NOTE: perform some version list pruning + // - Reverse the order, we want the newest entries first + // and we can't use 'order by' since we have no column + // to order by, but the entries should come out in the + // order they were added + // - Trim the list, we don't want every version of wine ever released + // - Add 'CVS' explicitly since we trim it out + // + // TODO: if we ever get a reasonable way to order the list replace this code + // with that + $aVersions = array(); + while(list($value) = mysql_fetch_row($hResult)) + { + // exclude unspecified versions + if($value != "unspecified") + $aVersions[] = $value; + } + + // now reverse the array order + $aVersions = array_reverse($aVersions); + + // now trim off all but the last X versions + $iVersionsToKeep = 6; + $aVersions = array_slice($aVersions, 0, $iVersionsToKeep); + + // explicitly add 'CVS' since we are eliminating that above + $aVersions[] = "CVS"; + + // DONE TRIMMING VERSIONS + ///////////////////////// + + + // build the selection array echo "<select name='$varname'>\n"; echo "<option value=\"\">Choose ...</option>\n"; - while(list($value) = mysql_fetch_row($hResult)) + foreach($aVersions as $sKey => $sValue) { - if($value == "unspecified") - { - // We do not unspecified versions!!! - } else - { - if($value == $cvalue) - echo "<option value=$value selected>$value\n"; - else - echo "<option value=$value>$value\n"; - } + if($sValue == $cvalue) + echo "<option value=$sValue selected>$sValue\n"; + else + echo "<option value=$sValue>$sValue\n"; } echo "</select>\n"; }

1 0

appdb/include application_queue.php
by WineHQ 07 Jun '07

07 Jun '07

ChangeSet ID: 31161 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/06 21:40:51 Modified files: include : application_queue.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add cellpadding to make the duplicates table look nicer Patch: http://cvs.winehq.org/patch.py?id=31161 Old revision New revision Changes Path 1.5 1.6 +1 -1 appdb/include/application_queue.php Index: appdb/include/application_queue.php diff -u -p appdb/include/application_queue.php:1.5 appdb/include/application_queue.php:1.6 --- appdb/include/application_queue.php:1.5 7 Jun 2007 2:40:51 -0000 +++ appdb/include/application_queue.php 7 Jun 2007 2:40:51 -0000 @@ -253,7 +253,7 @@ class application_queue $bCanMove = FALSE; } - echo "<table>"; + echo "<table cellpadding='5px'>"; echo html_tr($aHeader, "color4"); for($i = 0; $oRow = mysql_fetch_object($hResult); $i++)

1 0

appdb/include testData.php
by WineHQ 07 Jun '07

07 Jun '07

ChangeSet ID: 31160 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/06 21:04:16 Modified files: include : testData.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add a column to the test data queue to indicate whether a test result is for a application version that has maintainers. This lets admins defer processing test results to give appliction and version maintiners a chance to do so. Patch: http://cvs.winehq.org/patch.py?id=31160 Old revision New revision Changes Path 1.54 1.55 +7 -0 appdb/include/testData.php Index: appdb/include/testData.php diff -u -p appdb/include/testData.php:1.54 appdb/include/testData.php:1.55 --- appdb/include/testData.php:1.54 7 Jun 2007 2: 4:16 -0000 +++ appdb/include/testData.php 7 Jun 2007 2: 4:16 -0000 @@ -897,6 +897,7 @@ class testData{ "Application", "Version", "Release", + "Has maintainer", "Rating"); return $aCells; } @@ -911,12 +912,18 @@ class testData{ $oVersion = new version($this->iVersionId); $oApp = new application($oVersion->iAppId); $oUser = new user($this->iSubmitterId); + + // + $hMaintainers = maintainer::getMaintainersForAppIdVersionId(null, $this->iVersionId); + $bHasMaintainer = (mysql_num_rows($hMaintainers) == 0) ? false : true; + $aCells = array( print_date(mysqltimestamp_to_unixtimestamp($this->sSubmitTime)), $oUser->objectMakeLink(), $oApp->objectMakeLink(), $oVersion->objectMakeLink(), $this->sTestedRelease, + ($bHasMaintainer ? "YES" : "no"), $this->sTestedRating); if($this->canEdit() or $this->sQueued == "rejected")

1 0

Andrew Talbot : msi: Constify some variables.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: a0ae69a8d10a8be3344eeda35d17669668406802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ae69a8d10a8be3344eeda35… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Jun 5 18:53:43 2007 +0100 msi: Constify some variables. --- dlls/msi/helpers.c | 6 +++--- dlls/msi/insert.c | 6 +++--- dlls/msi/msi.c | 2 +- dlls/msi/msipriv.h | 12 ++++++------ dlls/msi/package.c | 2 +- dlls/msi/query.h | 4 ++-- dlls/msi/record.c | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/msi/helpers.c b/dlls/msi/helpers.c index 7357bd7..36cbda4 100644 --- a/dlls/msi/helpers.c +++ b/dlls/msi/helpers.c @@ -793,7 +793,7 @@ void ui_actiondata(MSIPACKAGE *package, LPCWSTR action, MSIRECORD * record) msiobj_release(&row->hdr); } -BOOL ACTION_VerifyComponentForAction( MSICOMPONENT* comp, INSTALLSTATE check ) +BOOL ACTION_VerifyComponentForAction( const MSICOMPONENT* comp, INSTALLSTATE check ) { if (!comp) return FALSE; @@ -807,7 +807,7 @@ BOOL ACTION_VerifyComponentForAction( MSICOMPONENT* comp, INSTALLSTATE check ) return FALSE; } -BOOL ACTION_VerifyFeatureForAction( MSIFEATURE* feature, INSTALLSTATE check ) +BOOL ACTION_VerifyFeatureForAction( const MSIFEATURE* feature, INSTALLSTATE check ) { if (!feature) return FALSE; @@ -969,7 +969,7 @@ UINT register_unique_action(MSIPACKAGE *package, LPCWSTR action) return ERROR_SUCCESS; } -BOOL check_unique_action(MSIPACKAGE *package, LPCWSTR action) +BOOL check_unique_action(const MSIPACKAGE *package, LPCWSTR action) { INT i; diff --git a/dlls/msi/insert.c b/dlls/msi/insert.c index 623359f..48706ea 100644 --- a/dlls/msi/insert.c +++ b/dlls/msi/insert.c @@ -62,7 +62,7 @@ static UINT INSERT_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * Merge a value_list and a record to create a second record. * Replace wildcard entries in the valuelist with values from the record */ -MSIRECORD *msi_query_merge_record( UINT fields, column_info *vl, MSIRECORD *rec ) +MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec ) { MSIRECORD *merged; DWORD wildcard_count = 1, i; @@ -234,7 +234,7 @@ static const MSIVIEWOPS insert_ops = INSERT_find_matching_rows }; -static UINT count_column_info( column_info *ci ) +static UINT count_column_info( const column_info *ci ) { UINT n = 0; for ( ; ci; ci = ci->next ) @@ -242,7 +242,7 @@ static UINT count_column_info( column_info *ci ) return n; } -UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, +UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, column_info *columns, column_info *values, BOOL temp ) { MSIINSERTVIEW *iv = NULL; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 34721df..927c47f 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1413,7 +1413,7 @@ INSTALLSTATE WINAPI MsiUseFeatureA( LPCSTR szProduct, LPCSTR szFeature ) * MSI_ProvideQualifiedComponentEx [internal] */ static UINT WINAPI MSI_ProvideQualifiedComponentEx(LPCWSTR szComponent, - LPCWSTR szQualifier, DWORD dwInstallMode, LPWSTR szProduct, + LPCWSTR szQualifier, DWORD dwInstallMode, LPCWSTR szProduct, DWORD Unused1, DWORD Unused2, awstring *lpPathBuf, DWORD* pcchPathBuf) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 2d05d76..c43f484 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -587,7 +587,7 @@ extern UINT MSI_SetFeatureStates( MSIPACKAGE *package ); /* record internals */ extern UINT MSI_RecordSetIStream( MSIRECORD *, unsigned int, IStream *); extern UINT MSI_RecordGetIStream( MSIRECORD *, unsigned int, IStream **); -extern const WCHAR *MSI_RecordGetString( MSIRECORD *, unsigned int ); +extern const WCHAR *MSI_RecordGetString( const MSIRECORD *, unsigned int ); extern MSIRECORD *MSI_CreateRecord( unsigned int ); extern UINT MSI_RecordSetInteger( MSIRECORD *, unsigned int, int ); extern UINT MSI_RecordSetStringW( MSIRECORD *, unsigned int, LPCWSTR ); @@ -597,7 +597,7 @@ extern UINT MSI_RecordGetStringW( MSIRECORD * , unsigned int, LPWSTR, DWORD *); extern UINT MSI_RecordGetStringA( MSIRECORD *, unsigned int, LPSTR, DWORD *); extern int MSI_RecordGetInteger( MSIRECORD *, unsigned int ); extern UINT MSI_RecordReadStream( MSIRECORD *, unsigned int, char *, DWORD *); -extern unsigned int MSI_RecordGetFieldCount( MSIRECORD *rec ); +extern unsigned int MSI_RecordGetFieldCount( const MSIRECORD *rec ); extern UINT MSI_RecordSetStream( MSIRECORD *, unsigned int, IStream * ); extern UINT MSI_RecordDataSize( MSIRECORD *, unsigned int ); extern UINT MSI_RecordStreamToFile( MSIRECORD *, unsigned int, LPCWSTR ); @@ -634,7 +634,7 @@ extern UINT VIEW_find_column( MSIVIEW *, LPCWSTR, UINT * ); extern UINT MSI_SetInstallLevel( MSIPACKAGE *package, int iInstallLevel ); /* package internals */ -extern MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *, LPWSTR ); +extern MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *, LPCWSTR ); extern UINT MSI_OpenPackageW( LPCWSTR szPackage, MSIPACKAGE ** ); extern UINT MSI_SetTargetPathW( MSIPACKAGE *, LPCWSTR, LPCWSTR ); extern UINT MSI_SetPropertyW( MSIPACKAGE *, LPCWSTR, LPCWSTR ); @@ -770,14 +770,14 @@ extern void msi_free_action_script(MSIPACKAGE *package, UINT script); extern LPWSTR build_icon_path(MSIPACKAGE *, LPCWSTR); extern LPWSTR build_directory_name(DWORD , ...); extern BOOL create_full_pathW(const WCHAR *path); -extern BOOL ACTION_VerifyComponentForAction(MSICOMPONENT*, INSTALLSTATE); -extern BOOL ACTION_VerifyFeatureForAction(MSIFEATURE*, INSTALLSTATE); +extern BOOL ACTION_VerifyComponentForAction(const MSICOMPONENT*, INSTALLSTATE); +extern BOOL ACTION_VerifyFeatureForAction(const MSIFEATURE*, INSTALLSTATE); extern void reduce_to_longfilename(WCHAR*); extern void reduce_to_shortfilename(WCHAR*); extern LPWSTR create_component_advertise_string(MSIPACKAGE*, MSICOMPONENT*, LPCWSTR); extern void ACTION_UpdateComponentStates(MSIPACKAGE *package, LPCWSTR szFeature); extern UINT register_unique_action(MSIPACKAGE *, LPCWSTR); -extern BOOL check_unique_action(MSIPACKAGE *, LPCWSTR); +extern BOOL check_unique_action(const MSIPACKAGE *, LPCWSTR); extern WCHAR* generate_error_string(MSIPACKAGE *, UINT, DWORD, ... ); extern UINT msi_create_component_directories( MSIPACKAGE *package ); extern void msi_ui_error( DWORD msg_id, DWORD type ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 77dbaff..e93ee03 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -587,7 +587,7 @@ static MSIPACKAGE *msi_alloc_package( void ) return package; } -MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPWSTR base_url ) +MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db, LPCWSTR base_url ) { static const WCHAR szLevel[] = { 'U','I','L','e','v','e','l',0 }; static const WCHAR szpi[] = {'%','i',0}; diff --git a/dlls/msi/query.h b/dlls/msi/query.h index 2bf8955..6cb7709 100644 --- a/dlls/msi/query.h +++ b/dlls/msi/query.h @@ -111,7 +111,7 @@ UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table, UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, column_info *col_info, BOOL hold ); -UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table, +UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table, column_info *columns, column_info *values, BOOL temp ); UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **, LPWSTR table, @@ -128,7 +128,7 @@ UINT STREAMS_CreateView( MSIDATABASE *db, MSIVIEW **view ); int sqliteGetToken(const WCHAR *z, int *tokenType); -MSIRECORD *msi_query_merge_record( UINT fields, column_info *vl, MSIRECORD *rec ); +MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec ); UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info, BOOL persistent, MSITABLE **table_ret); diff --git a/dlls/msi/record.c b/dlls/msi/record.c index fed7bf4..159f7d1 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -106,7 +106,7 @@ MSIHANDLE WINAPI MsiCreateRecord( unsigned int cParams ) return ret; } -unsigned int MSI_RecordGetFieldCount( MSIRECORD *rec ) +unsigned int MSI_RecordGetFieldCount( const MSIRECORD *rec ) { return rec->count; } @@ -393,7 +393,7 @@ UINT WINAPI MsiRecordGetStringA(MSIHANDLE handle, unsigned int iField, return ret; } -const WCHAR *MSI_RecordGetString( MSIRECORD *rec, unsigned int iField ) +const WCHAR *MSI_RecordGetString( const MSIRECORD *rec, unsigned int iField ) { if( iField > rec->count ) return NULL;

1 0

Andrew Talbot : oleaut32: Fix some typos.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: 1ab9649079fd13978717022d5051c9851c88db2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ab9649079fd13978717022d5… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Tue Jun 5 23:08:40 2007 +0100 oleaut32: Fix some typos. --- dlls/oleaut32/oleaut.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 1fe68b8..6778af1 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -691,8 +691,8 @@ HRESULT WINAPI OleTranslateColor( extern HRESULT OLEAUTPS_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv); -extern void _get_STDFONT_CF(LPVOID); -extern void _get_STDPIC_CF(LPVOID); +extern void _get_STDFONT_CF(LPVOID *); +extern void _get_STDPIC_CF(LPVOID *); static HRESULT WINAPI PSDispatchFacBuf_QueryInterface(IPSFactoryBuffer *iface, REFIID riid, void **ppv) {

1 0

Lei Zhang : wined3d: Various spelling fixes.
by Alexandre Julliard 06 Jun '07

06 Jun '07

Module: wine Branch: master Commit: f00670df6135eba1cb162aac954765619ce5f605 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f00670df6135eba1cb162aac9… Author: Lei Zhang <thestig(a)fido.smo.corp.google.com> Date: Tue Jun 5 15:21:08 2007 -0700 wined3d: Various spelling fixes. --- dlls/wined3d/surface.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4cb29ef..4cd4f0c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -457,7 +457,7 @@ void WINAPI IWineD3DSurfaceImpl_PreLoad(IWineD3DSurface *iface) { TRACE("(%p)Checking to see if the container is a base texture\n", This); if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&baseTexture) == WINED3D_OK) { - TRACE("Passing to conatiner\n"); + TRACE("Passing to container\n"); IWineD3DBaseTexture_PreLoad(baseTexture); IWineD3DBaseTexture_Release(baseTexture); } else { @@ -570,7 +570,7 @@ void WINAPI IWineD3DSurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor * /* TODO: think about moving this down to resource? */ const void *WINAPI IWineD3DSurfaceImpl_GetData(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - /* This should only be called for sysmem textures, it may be a good idea to extend this to all pools at some point in the futture */ + /* This should only be called for sysmem textures, it may be a good idea to extend this to all pools at some point in the future */ if (This->resource.pool != WINED3DPOOL_SYSTEMMEM) { FIXME(" (%p)Attempting to get system memory for a non-system memory texture\n", iface); } @@ -753,7 +753,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED This->lockCount++; /* MAXLOCKCOUNT is defined in wined3d_private.h */ if(This->lockCount > MAXLOCKCOUNT) { - TRACE("Surface is locked regularily, not freeing the system memory copy any more\n"); + TRACE("Surface is locked regularly, not freeing the system memory copy any more\n"); This->Flags |= SFLAG_DYNLOCK; } } @@ -855,7 +855,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED FIXME("Depth stencil locking not supported yet\n"); } else { /* This path is for normal surfaces, offscreen render targets and everything else that is in a gl texture */ - TRACE("locking an ordinarary surface\n"); + TRACE("locking an ordinary surface\n"); if (0 != This->glDescription.textureName) { /* Now I have to copy thing bits back */ @@ -2147,7 +2147,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SaveSnapshot(IWineD3DSurface *iface, const ch ERR("opening of %s failed with: %s\n", filename, strerror(errno)); return WINED3DERR_INVALIDCALL; } -/* Save the dat out to a TGA file because 1: it's an easy raw format, 2: it supports an alpha chanel*/ +/* Save the dat out to a TGA file because 1: it's an easy raw format, 2: it supports an alpha channel*/ TRACE("(%p) opened %s with format %s\n", This, filename, debug_d3dformat(This->resource.format)); /* TGA header */ fputc(0,f); @@ -2221,7 +2221,7 @@ extern HRESULT WINAPI IWineD3DSurfaceImpl_AddDirtyRect(IWineD3DSurface *iface, C This->dirtyRect.top, This->dirtyRect.right, This->dirtyRect.bottom); /* if the container is a basetexture then mark it dirty. */ if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&baseTexture) == WINED3D_OK) { - TRACE("Passing to conatiner\n"); + TRACE("Passing to container\n"); IWineD3DBaseTexture_SetDirty(baseTexture, TRUE); IWineD3DBaseTexture_Release(baseTexture); } @@ -2246,11 +2246,11 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3DFORM const PixelFormatDesc *formatEntry = getFormatDescEntry(format); if (This->resource.format != WINED3DFMT_UNKNOWN) { - FIXME("(%p) : The foramt of the surface must be WINED3DFORMAT_UNKNOWN\n", This); + FIXME("(%p) : The format of the surface must be WINED3DFORMAT_UNKNOWN\n", This); return WINED3DERR_INVALIDCALL; } - TRACE("(%p) : Setting texture foramt to (%d,%s)\n", This, format, debug_d3dformat(format)); + TRACE("(%p) : Setting texture format to (%d,%s)\n", This, format, debug_d3dformat(format)); if (format == WINED3DFMT_UNKNOWN) { This->resource.size = 0; } else if (format == WINED3DFMT_DXT1) { @@ -2420,10 +2420,10 @@ static inline void fb_copy_to_texture_direct(IWineD3DSurfaceImpl *This, IWineD3D } else { UINT yoffset = Src->currentDesc.Height - srect->y1 + drect->y1 - 1; /* I have to process this row by row to swap the image, - * otherwise it would be upside down, so streching in y direction + * otherwise it would be upside down, so stretching in y direction * doesn't cost extra time * - * However, streching in x direction can be avoided if not necessary + * However, stretching in x direction can be avoided if not necessary */ for(row = drect->y1; row < drect->y2; row++) { if( (xrel - 1.0 < -eps) || (xrel - 1.0 > eps)) { @@ -2763,7 +2763,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * * untouched. Therefore it's necessary to override the swap effect * and to set it back after the flip. * - * Windowed Direct3D < 7 apps do the same. The D3D7 sdk demso are nice + * Windowed Direct3D < 7 apps do the same. The D3D7 sdk demos are nice * testcases. */ @@ -2807,7 +2807,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(0)); IWineD3DSurface_PreLoad((IWineD3DSurface *) This); - /* Make sure that the top pixel is always above the bottom pixel, and keep a seperate upside down flag + /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag * glCopyTexSubImage is a bit picky about the parameters we pass to it */ if(SrcRect) { @@ -2919,7 +2919,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * * * Just modify the color keying parameters in the surface and restore them afterwards * The surface keeps track of the color key last used to load the opengl surface. - * PreLoad will catch the change to the flags and color key and reload if neccessary. + * PreLoad will catch the change to the flags and color key and reload if necessary. */ if(Flags & WINEDDBLT_KEYSRC) { /* Use color key from surface */ @@ -3416,7 +3416,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { if ((This->pow2Width > GL_LIMITS(texture_size) || This->pow2Height > GL_LIMITS(texture_size)) && !(This->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) { /* one of three options 1: Do the same as we do with nonpow 2 and scale the texture, (any texture ops would require the texture to be scaled which is potentially slow) - 2: Set the texture to the maxium size (bad idea) + 2: Set the texture to the maximum size (bad idea) 3: WARN and return WINED3DERR_NOTAVAILABLE; 4: Create the surface, but allow it to be used only for DirectDraw Blts. Some apps(e.g. Swat 3) create textures with a Height of 16 and a Width > 3000 and blt 16x16 letter areas from them to the render target. */

1 0