September 2007 - Wine-Commits

Chris Morgan : Fix 'Using $this when not in object context error' by using the same method used in Application::canEdit() and Appliction:: objectGetEntries()
by Chris Morgan Sept. 25, 2007

Sept. 25, 2007

Module: appdb Branch: master Commit: e07e0f5f11e445c69ca2374d970f87e6d935e58a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e07e0f5f11e445c69ca2374d… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Mon Sep 24 22:09:01 2007 -0400 Fix 'Using $this when not in object context error' by using the same method used in Application::canEdit() and Appliction::objectGetEntries() --- include/version.php | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/version.php b/include/version.php index 513ba1a..18a4e2b 100644 --- a/include/version.php +++ b/include/version.php @@ -1372,7 +1372,7 @@ class version { if($_SESSION['current']->hasPriv("admin")) return TRUE; - else if($this->iVersionId) + if(isset($this) && is_object($this) && $this->iVersionId) { if(maintainer::isUserMaintainer($_SESSION['current'], $this->iVersionId)) return TRUE; @@ -1381,9 +1381,10 @@ class version { return TRUE; return FALSE; - } - else + } else + { return FALSE; + } } public function mustBeQueued() @@ -1451,7 +1452,7 @@ class version { $iRows = maintainer::objectGetEntriesCount($bQueued, $bRejected); } - if($bQueued && !$this->canEdit()) + if($bQueued && !version::canEdit()) { /* Users should see their own rejected entries, but maintainers should not be able to see rejected entries for versions they maintain */

1 0

Chris Morgan : Minor code formatting changes for clarity.
by Chris Morgan Sept. 25, 2007

Sept. 25, 2007

Module: appdb Branch: master Commit: 09466f59a1d26a8178607ee92442f058a59729e5 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=09466f59a1d26a8178607ee9… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Mon Sep 24 22:08:22 2007 -0400 Minor code formatting changes for clarity. --- include/application.php | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/application.php b/include/application.php index 476b5d6..e8f826e 100644 --- a/include/application.php +++ b/include/application.php @@ -970,12 +970,15 @@ class Application { if($this->sQueued != "true" && $this->iSubmitterId = $_SESSION['current']->iUserId) + { return TRUE; + } return FALSE; - } - else + } else + { return FALSE; + } } public function mustBeQueued()

1 0

Chris Morgan : Confusion between sAction=view and sAction= display broke viewing/displaying items. Standardize on sAction= view until we can come up with a more robust way of ensuring the same issue doesn 't happen again.
by Chris Morgan Sept. 25, 2007

Sept. 25, 2007

Module: appdb Branch: master Commit: a6f76eb8923c4ea76b8b153bb641c60facc0ad0b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a6f76eb8923c4ea76b8b153b… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Mon Sep 24 21:35:35 2007 -0400 Confusion between sAction=view and sAction=display broke viewing/displaying items. Standardize on sAction=view until we can come up with a more robust way of ensuring the same issue doesn't happen again. --- appview.php | 2 +- include/application.php | 2 +- include/objectManager.php | 2 +- include/version.php | 4 ++-- objectManager.php | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/appview.php b/appview.php index f154840..dc2e1f7 100644 --- a/appview.php +++ b/appview.php @@ -22,7 +22,7 @@ if(isset($aClean['iAppId']) || isset($aClean['iVersionId'])) // Valid args $oObject = new Version($aClean['iVersionId']); // header - apidb_header($oObject->objectGetCustomTitle("display")); + apidb_header($oObject->objectGetCustomTitle("view")); if(isset($aClean['iVersionId'])) $oObject->display($aClean); diff --git a/include/application.php b/include/application.php index 920babe..476b5d6 100644 --- a/include/application.php +++ b/include/application.php @@ -670,7 +670,7 @@ class Application { { switch($sAction) { - case "display": + case "view": return "Viewing App: ".$this->sName; default: diff --git a/include/objectManager.php b/include/objectManager.php index 4a09015..0aacf10 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -794,7 +794,7 @@ class ObjectManager $oObject = new $this->sClass($this->iId); - $aVars = $this->get_custom_vars($aClean, "display"); + $aVars = $this->get_custom_vars($aClean, "view"); if(!$aVars) $oObject->display(); diff --git a/include/version.php b/include/version.php index c84491e..513ba1a 100644 --- a/include/version.php +++ b/include/version.php @@ -724,7 +724,7 @@ class version { { switch($sAction) { - case "display": + case "view": return "Viewing App: ".version::fullName($this->iVersionId); default: @@ -736,7 +736,7 @@ class version { { switch($sAction) { - case "display": + case "view": /* Allow the user to select which test report is shown in the version view */ return array("iTestingId"); diff --git a/objectManager.php b/objectManager.php index 983726e..55bfefb 100644 --- a/objectManager.php +++ b/objectManager.php @@ -85,7 +85,7 @@ $sAction = $aClean['sAction']; if(!$sAction) { if($oObject->iId) - $sAction = "display"; + $sAction = "view"; } apidb_header($oObject->get_title($sAction)); @@ -111,7 +111,7 @@ if($oObject->iId && $sAction != "add") $oObject->delete_prompt(); break; - case "display": + case "view": $oObject->view($_SERVER['REQUEST_URI'], $aClean); break; }

1 0

Chris Morgan : Add more php5 scope keywords to class methods.
by Chris Morgan Sept. 25, 2007

Sept. 25, 2007

Module: appdb Branch: master Commit: fafcbce1bd070b7aa94f4ab3576646bd52650ffa URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fafcbce1bd070b7aa94f4ab3… Author: Chris Morgan <cmorgan(a)alum.wpi.edu> Date: Mon Sep 24 21:11:29 2007 -0400 Add more php5 scope keywords to class methods. --- include/application.php | 86 +++++++++++++++++++++++----------------------- include/maintainer.php | 12 +----- include/version.php | 83 +++++++++++++++++++++++---------------------- 3 files changed, 87 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=fafcbce1bd070b7aa94f…

1 0

Alexander Nicolaysen Sørnes : testData: add preview support
by Chris Morgan Sept. 25, 2007

Sept. 25, 2007

Module: appdb Branch: master Commit: fb20a7b54656460b0cf3a1c73d6e808440dfd689 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fb20a7b54656460b0cf3a1c7… Author: Alexander Nicolaysen Sørnes <alexander(a)alex.alexstyrt> Date: Tue Sep 25 02:43:35 2007 +0200 testData: add preview support --- include/testData.php | 198 +++++++++++++++++++++++++------------------- include/testData_queue.php | 5 + 2 files changed, 117 insertions(+), 86 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=fb20a7b54656460b0cf3…

1 0

Alexander Nicolaysen Sørnes : objectManager: Use '===' to check for Preview requests
by Chris Morgan Sept. 25, 2007

Sept. 25, 2007

Module: appdb Branch: master Commit: 2d7a93b05c876d0459ccce91a9c529c1d08c01c2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2d7a93b05c876d0459ccce91… Author: Alexander Nicolaysen Sørnes <alexander(a)kurt.alexstyrt> Date: Mon Sep 24 18:30:10 2007 +0200 objectManager: Use '===' to check for Preview requests --- include/objectManager.php | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index f70c9db..4a09015 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -239,7 +239,7 @@ class ObjectManager global $aClean; $oObject->getOutputEditorValues($aClean); - if($sErrors == PREVIEW_ENTRY) + if($sErrors === PREVIEW_ENTRY) $this->show_preview($oObject, $aClean); } @@ -669,7 +669,7 @@ class ObjectManager global $aClean; $oObject->getOutputEditorValues($aClean); - if($sErrors == PREVIEW_ENTRY) + if($sErrors === PREVIEW_ENTRY) $this->show_preview($oObject, $aClean); }

1 0

Alexander Nicolaysen Sørnes : testData: Fix 'Show All Tests' button
by Chris Morgan Sept. 25, 2007

Sept. 25, 2007

Module: appdb Branch: master Commit: c90d271886c0d535e77513be4c97cc33f0d2c27b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c90d271886c0d535e77513be… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Sep 24 13:26:49 2007 +0200 testData: Fix 'Show All Tests' button --- include/objectManager.php | 1 + include/testData.php | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 7d749ae..f70c9db 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -963,6 +963,7 @@ class ObjectManager $sReturn .= "<input type=\"hidden\" name=\"sClass\" value=\"".$this->sClass."\" />\n"; $sReturn .= "<input type=\"hidden\" name=\"sTitle\" value=\"".$this->sTitle."\" />\n"; $sReturn .= "<input type=\"hidden\" name=\"sReturnTo\" value=\"".$this->sReturnTo."\" />\n"; + $sReturn .= "<input type=\"hidden\" name=\"iId\" value=\"".$this->iId."\" />\n"; if($this->oMultiPage->bEnabled) { diff --git a/include/testData.php b/include/testData.php index dc5d7de..3935b21 100644 --- a/include/testData.php +++ b/include/testData.php @@ -480,7 +480,7 @@ class testData{ $link = query_escape_string($link); $iDisplayLimit = query_escape_string($iDisplayLimit); - $sShowAll = isset($aClean['sShowAll']) ? $aClean['sShowAll'] : false; + $bShowAll = ($aClean['bShowAll'] == "true") ? true : false; $sQuery = "SELECT * FROM testResults @@ -489,7 +489,7 @@ class testData{ queued = '?' ORDER BY testedDate DESC"; - if(!$sShowAll) + if(!$bShowAll) $sQuery.=" LIMIT 0,".$iDisplayLimit; $hResult = query_parameters($sQuery, $this->iVersionId, "false"); @@ -603,15 +603,23 @@ class testData{ echo '<br />',"\n"; // put a space after the test results table and the button - echo '<form method=get action="'.$_SERVER['PHP_SELF'].'">'."\n"; - echo "\t".'<input name="iVersionId" type=hidden value="',$this->iVersionId,'" />'."\n"; - if($rowsUsed >= $iDisplayLimit && !is_string($sShowAll)) - echo "\t".'<input class="button" name="sShowAll" type=submit value="Show All Tests" />'."\n"; + echo '<form method=get action="objectManager.php">'."\n"; - if(is_string($sShowAll)) + if($rowsUsed >= $iDisplayLimit && $bShowAll) { - echo "\t".'<input class="button" name="sHideAll" type=submit value="Limit to '.$iDisplayLimit.' Tests" />'."\n"; + $sShowButtonText = "Limit to $iDisplayLimit Tests"; + } else + { + $sShowButtonText = "Show All Tests"; + echo '<input type="hidden" name="bShowAll" value="true" />'; } + + $oManager = new objectManager("version", null, $this->iVersionId); + + echo $oManager->makeUrlFormData(); + + echo "\t".'<input class="button" type=submit value="'.$sShowButtonText.'" />'."\n"; + echo '</form>'."\n"; echo '</div>',"\n"; // end of the 'info_contents' div

1 0

Alexander Nicolaysen Sørnes : maintainer : Make the unit tests happy
by Chris Morgan Sept. 24, 2007

Sept. 24, 2007

Module: appdb Branch: master Commit: c4736bf21cb77ad5a5b29ee6d5967f288d342bc2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c4736bf21cb77ad5a5b29ee6… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Sep 24 09:26:55 2007 +0200 maintainer: Make the unit tests happy --- include/maintainer.php | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 4c63ef1..6aae664 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -214,11 +214,14 @@ class maintainer return NULL; } + if(!$this->iUserId) + $this->iUserId = $_SESSION['current']->iUserId; + $hResult = query_parameters("INSERT INTO appMaintainers (appId, versionId, ". "userId, maintainReason, superMaintainer, submitTime, queued) ". "VALUES ('?', '?', '?', '?', '?', ?, '?')", $this->iAppId, $this->iVersionId, - $_SESSION['current']->iUserId, $this->sMaintainReason, + $this->iUserId, $this->sMaintainReason, $this->bSuperMaintainer, "NOW()", $this->mustBeQueued() ? "true" : "false"); /* this objects id is the insert id returned by the database */

1 0

Hans Leidekker : msvcrt: Implement _wspawnv{, e, p, pe}.
by Alexandre Julliard Sept. 24, 2007

Sept. 24, 2007

Module: wine Branch: master Commit: 1efae756c3e23b43004994436934b1ea4e0347e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1efae756c3e23b43004994436… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Sep 21 15:50:01 2007 +0200 msvcrt: Implement _wspawnv{, e, p, pe}. --- dlls/msvcrt/file.c | 14 ++-- dlls/msvcrt/msvcrt.h | 3 +- dlls/msvcrt/msvcrt.spec | 8 +- dlls/msvcrt/process.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 195 insertions(+), 13 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c46b5c4..4ceae0b 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -283,23 +283,23 @@ static int msvcrt_init_fp(MSVCRT_FILE* file, int fd, unsigned stream_flags) * 04 char file flags (wxflag): repeated for each fd * 4+NBFD HANDLE file handle: repeated for each fd */ -unsigned msvcrt_create_io_inherit_block(STARTUPINFOA* si) +unsigned msvcrt_create_io_inherit_block(WORD *size, BYTE **block) { int fd; char* wxflag_ptr; HANDLE* handle_ptr; - si->cbReserved2 = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * MSVCRT_fdend; - si->lpReserved2 = MSVCRT_calloc(si->cbReserved2, 1); - if (!si->lpReserved2) + *size = sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * MSVCRT_fdend; + *block = MSVCRT_calloc(*size, 1); + if (!*block) { - si->cbReserved2 = 0; + *size = 0; return FALSE; } - wxflag_ptr = (char*)si->lpReserved2 + sizeof(unsigned); + wxflag_ptr = (char*)*block + sizeof(unsigned); handle_ptr = (HANDLE*)(wxflag_ptr + MSVCRT_fdend * sizeof(char)); - *(unsigned*)si->lpReserved2 = MSVCRT_fdend; + *(unsigned*)*block = MSVCRT_fdend; for (fd = 0; fd < MSVCRT_fdend; fd++) { /* to be inherited, we need it to be open, and that DONTINHERIT isn't set */ diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index cc3cdd7..204fe9c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -152,7 +152,7 @@ extern void msvcrt_free_args(void); extern void msvcrt_init_signals(void); extern void msvcrt_free_signals(void); -extern unsigned msvcrt_create_io_inherit_block(STARTUPINFOA*); +extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**); /* run-time error codes */ #define _RT_STACK 0 @@ -652,6 +652,7 @@ int MSVCRT__dup(int); int MSVCRT__dup2(int, int); int MSVCRT__pipe(int *, unsigned int, int); MSVCRT_wchar_t* _wgetenv(const MSVCRT_wchar_t*); +void _wsearchenv(const MSVCRT_wchar_t*, const MSVCRT_wchar_t*, MSVCRT_wchar_t*); #endif #endif /* __WINE_MSVCRT_H */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 74d1fad..5711946 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -559,10 +559,10 @@ @ stub _wspawnle #(long wstr wstr) varargs @ stub _wspawnlp #(long wstr wstr) varargs @ stub _wspawnlpe #(long wstr wstr) varargs -@ stub _wspawnv #(long wstr ptr) -@ stub _wspawnve #(long wstr ptr ptr) -@ stub _wspawnvp #(long wstr ptr) -@ stub _wspawnvpe #(long wstr ptr ptr) +@ stdcall _wspawnv(long wstr ptr) +@ stdcall _wspawnve(long wstr ptr ptr) +@ stdcall _wspawnvp(long wstr ptr) +@ stdcall _wspawnvpe(long wstr ptr ptr) @ cdecl _wsplitpath(wstr wstr wstr wstr wstr) @ cdecl _wstat(wstr ptr) MSVCRT__wstat @ cdecl _wstati64(wstr ptr) MSVCRT__wstati64 diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c index c6c3a7e..14f8e9a 100644 --- a/dlls/msvcrt/process.c +++ b/dlls/msvcrt/process.c @@ -31,6 +31,7 @@ #include "msvcrt.h" #include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); @@ -48,7 +49,7 @@ static MSVCRT_intptr_t msvcrt_spawn(int flags, const char* exe, char* cmdline, c memset(&si, 0, sizeof(si)); si.cb = sizeof(si); - msvcrt_create_io_inherit_block(&si); + msvcrt_create_io_inherit_block(&si.cbReserved2, &si.lpReserved2); if (!CreateProcessA(exe, cmdline, NULL, NULL, TRUE, flags == MSVCRT__P_DETACH ? DETACHED_PROCESS : 0, env, NULL, &si, &pi)) @@ -81,6 +82,52 @@ static MSVCRT_intptr_t msvcrt_spawn(int flags, const char* exe, char* cmdline, c return -1; /* can't reach here */ } +static MSVCRT_intptr_t msvcrt_spawn_wide(int flags, const MSVCRT_wchar_t* exe, MSVCRT_wchar_t* cmdline, MSVCRT_wchar_t* env) +{ + STARTUPINFOW si; + PROCESS_INFORMATION pi; + + if ((unsigned)flags > MSVCRT__P_DETACH) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + msvcrt_create_io_inherit_block(&si.cbReserved2, &si.lpReserved2); + if (!CreateProcessW(exe, cmdline, NULL, NULL, TRUE, + flags == MSVCRT__P_DETACH ? DETACHED_PROCESS : 0, + env, NULL, &si, &pi)) + { + msvcrt_set_errno(GetLastError()); + MSVCRT_free(si.lpReserved2); + return -1; + } + + MSVCRT_free(si.lpReserved2); + switch(flags) + { + case MSVCRT__P_WAIT: + WaitForSingleObject(pi.hProcess, INFINITE); + GetExitCodeProcess(pi.hProcess,&pi.dwProcessId); + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + return pi.dwProcessId; + case MSVCRT__P_DETACH: + CloseHandle(pi.hProcess); + pi.hProcess = 0; + /* fall through */ + case MSVCRT__P_NOWAIT: + case MSVCRT__P_NOWAITO: + CloseHandle(pi.hThread); + return (MSVCRT_intptr_t)pi.hProcess; + case MSVCRT__P_OVERLAY: + MSVCRT__exit(0); + } + return -1; /* can't reach here */ +} + /* INTERNAL: Convert argv list to a single 'delim'-separated string, with an * extra '\0' to terminate it */ @@ -126,6 +173,48 @@ static char* msvcrt_argvtos(const char* const* arg, char delim) return ret; } +static MSVCRT_wchar_t* msvcrt_argvtos_wide(const MSVCRT_wchar_t* const* arg, MSVCRT_wchar_t delim) +{ + const MSVCRT_wchar_t* const* a; + long size; + MSVCRT_wchar_t* p; + MSVCRT_wchar_t* ret; + + if (!arg && !delim) + { + /* Return NULL for an empty environment list */ + return NULL; + } + + /* get length */ + a = arg; + size = 0; + while (*a) + { + size += strlenW(*a) + 1; + a++; + } + + ret = MSVCRT_malloc((size + 1) * sizeof(MSVCRT_wchar_t)); + if (!ret) + return NULL; + + /* fill string */ + a = arg; + p = ret; + while (*a) + { + int len = strlenW(*a); + memcpy(p,*a,len * sizeof(MSVCRT_wchar_t)); + p += len; + *p++ = delim; + a++; + } + if (delim && p > ret) p[-1] = 0; + else *p = 0; + return ret; +} + /* INTERNAL: Convert va_list to a single 'delim'-separated string, with an * extra '\0' to terminate it */ @@ -488,6 +577,63 @@ MSVCRT_intptr_t CDECL _spawnve(int flags, const char* name, const char* const* a } /********************************************************************* + * _wspawnve (MSVCRT.@) + * + * Unicode version of _spawnve + */ +MSVCRT_intptr_t CDECL _wspawnve(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv, + const MSVCRT_wchar_t* const* envv) +{ + MSVCRT_wchar_t * args = msvcrt_argvtos_wide(argv,' '); + MSVCRT_wchar_t * envs = msvcrt_argvtos_wide(envv,0); + MSVCRT_wchar_t fullname[MAX_PATH]; + const MSVCRT_wchar_t *p; + int len; + MSVCRT_intptr_t ret = -1; + + TRACE(":call (%s), params (%s), env (%s)\n",debugstr_w(name),debugstr_w(args), + envs?"Custom":"Null"); + + /* no check for NULL name. + native doesn't do it */ + + p = memchrW(name, '\0', MAX_PATH); + if( !p ) + p = name + MAX_PATH - 1; + len = p - name; + + /* extra-long names are silently truncated. */ + memcpy(fullname, name, len * sizeof(MSVCRT_wchar_t)); + + for( p--; p >= name; p-- ) + { + if( *p == '\\' || *p == '/' || *p == ':' || *p == '.' ) + break; + } + + /* if no extension is given, assume .exe */ + if( (p < name || *p != '.') && len <= MAX_PATH - 5 ) + { + static const MSVCRT_wchar_t dotexe[] = {'.','e','x','e'}; + + FIXME("only trying .exe when no extension given\n"); + memcpy(fullname+len, dotexe, 4 * sizeof(MSVCRT_wchar_t)); + len += 4; + } + + fullname[len] = '\0'; + + if (args) + { + ret = msvcrt_spawn_wide(flags, fullname, args, envs); + MSVCRT_free(args); + } + MSVCRT_free(envs); + + return ret; +} + +/********************************************************************* * _spawnv (MSVCRT.@) * * Like on Windows, this function does not handle arguments with spaces @@ -499,6 +645,16 @@ MSVCRT_intptr_t CDECL _spawnv(int flags, const char* name, const char* const* ar } /********************************************************************* + * _wspawnv (MSVCRT.@) + * + * Unicode version of _spawnv + */ +MSVCRT_intptr_t CDECL _wspawnv(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv) +{ + return _wspawnve(flags, name, argv, NULL); +} + +/********************************************************************* * _spawnvpe (MSVCRT.@) * * Like on Windows, this function does not handle arguments with spaces @@ -513,6 +669,21 @@ MSVCRT_intptr_t CDECL _spawnvpe(int flags, const char* name, const char* const* } /********************************************************************* + * _wspawnvpe (MSVCRT.@) + * + * Unicode version of _spawnvpe + */ +MSVCRT_intptr_t CDECL _wspawnvpe(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv, + const MSVCRT_wchar_t* const* envv) +{ + static const MSVCRT_wchar_t path[] = {'P','A','T','H',0}; + MSVCRT_wchar_t fullname[MAX_PATH]; + + _wsearchenv(name, path, fullname); + return _wspawnve(flags, fullname[0] ? fullname : name, argv, envv); +} + +/********************************************************************* * _spawnvp (MSVCRT.@) * * Like on Windows, this function does not handle arguments with spaces @@ -524,6 +695,16 @@ MSVCRT_intptr_t CDECL _spawnvp(int flags, const char* name, const char* const* a } /********************************************************************* + * _wspawnvp (MSVCRT.@) + * + * Unicode version of _spawnvp + */ +MSVCRT_intptr_t CDECL _wspawnvp(int flags, const MSVCRT_wchar_t* name, const MSVCRT_wchar_t* const* argv) +{ + return _wspawnvpe(flags, name, argv, NULL); +} + +/********************************************************************* * _popen (MSVCRT.@) * FIXME: convert to _wpopen and call that from here instead? But it * would have to convert the command back to ANSI to call msvcrt_spawn,

1 0

Hans Leidekker : msvcrt: Implement _wsearchenv.
by Alexandre Julliard Sept. 24, 2007

Sept. 24, 2007

Module: wine Branch: master Commit: 7d3d98eb5c12637c560c8627fdc46f196098550d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d3d98eb5c12637c560c8627f… Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri Sep 21 15:49:37 2007 +0200 msvcrt: Implement _wsearchenv. --- dlls/msvcrt/dir.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- 3 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 06013c6..3da6efa 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1010,3 +1010,66 @@ void CDECL _searchenv(const char* file, const char* env, char *buf) penv = *end ? end + 1 : end; } while(1); } + +/********************************************************************* + * _wsearchenv (MSVCRT.@) + * + * Unicode version of _searchenv + */ +void CDECL _wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env, MSVCRT_wchar_t *buf) +{ + MSVCRT_wchar_t *envVal, *penv; + MSVCRT_wchar_t curPath[MAX_PATH]; + + *buf = '\0'; + + /* Try CWD first */ + if (GetFileAttributesW( file ) != INVALID_FILE_ATTRIBUTES) + { + GetFullPathNameW( file, MAX_PATH, buf, NULL ); + /* Sigh. This error is *always* set, regardless of success */ + msvcrt_set_errno(ERROR_FILE_NOT_FOUND); + return; + } + + /* Search given environment variable */ + envVal = _wgetenv(env); + if (!envVal) + { + msvcrt_set_errno(ERROR_FILE_NOT_FOUND); + return; + } + + penv = envVal; + TRACE(":searching for %s in paths %s\n", debugstr_w(file), debugstr_w(envVal)); + + do + { + MSVCRT_wchar_t *end = penv; + + while(*end && *end != ';') end++; /* Find end of next path */ + if (penv == end || !*penv) + { + msvcrt_set_errno(ERROR_FILE_NOT_FOUND); + return; + } + memcpy(curPath, penv, (end - penv) * sizeof(MSVCRT_wchar_t)); + if (curPath[end - penv] != '/' || curPath[end - penv] != '\\') + { + curPath[end - penv] = '\\'; + curPath[end - penv + 1] = '\0'; + } + else + curPath[end - penv] = '\0'; + + strcatW(curPath, file); + TRACE("Checking for file %s\n", debugstr_w(curPath)); + if (GetFileAttributesW( curPath ) != INVALID_FILE_ATTRIBUTES) + { + strcpyW(buf, curPath); + msvcrt_set_errno(ERROR_FILE_NOT_FOUND); + return; /* Found */ + } + penv = *end ? end + 1 : end; + } while(1); +} diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3a9d5c3..cc3cdd7 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -651,6 +651,7 @@ int MSVCRT__close(int); int MSVCRT__dup(int); int MSVCRT__dup2(int, int); int MSVCRT__pipe(int *, unsigned int, int); +MSVCRT_wchar_t* _wgetenv(const MSVCRT_wchar_t*); #endif #endif /* __WINE_MSVCRT_H */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 10a8686..74d1fad 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -552,7 +552,7 @@ @ cdecl _wrename(wstr wstr) @ cdecl _write(long ptr long) MSVCRT__write @ cdecl _wrmdir(wstr) -@ stub _wsearchenv #(wstr wstr ptr) +@ stdcall _wsearchenv(wstr wstr ptr) @ cdecl _wsetlocale(long wstr) MSVCRT__wsetlocale @ varargs _wsopen (wstr long long) MSVCRT__wsopen @ stub _wspawnl #(long wstr wstr) varargs

1 0