December 2007 - Wine-commits

Francois Gouget : inetcomm/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: b8ee5573862477cd03aa2e48c876598c3ee9ab54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8ee5573862477cd03aa2e48c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 7 00:59:29 2007 +0100 inetcomm/tests: Fix compilation on systems that don't support nameless unions. --- dlls/inetcomm/tests/mimeole.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index c425c21..51135d1 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -116,7 +116,7 @@ static void test_CreateBody(void) ok(hr == S_OK, "ret %08x\n", hr); off.QuadPart = 0; IStream_Seek(in, off, STREAM_SEEK_CUR, &pos); - ok(pos.LowPart == 328, "pos %u\n", pos.LowPart); + ok(pos.u.LowPart == 328, "pos %u\n", pos.u.LowPart); hr = IMimeBody_IsContentType(body, "multipart", "mixed"); ok(hr == S_OK, "ret %08x\n", hr);

1 0

Michael Stefaniuc : user32/tests: Pass HEAP_ZERO_MEMORY to HeapAlloc() instead of clearing the memory with a separate memset() call.
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: 64b7359265ba2a386d2864504fd2b61bcdcc6249 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64b7359265ba2a386d2864504… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 7 01:14:24 2007 +0100 user32/tests: Pass HEAP_ZERO_MEMORY to HeapAlloc() instead of clearing the memory with a separate memset() call. --- dlls/user32/tests/listbox.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/listbox.c b/dlls/user32/tests/listbox.c index 529e2c0..9829bd5 100644 --- a/dlls/user32/tests/listbox.c +++ b/dlls/user32/tests/listbox.c @@ -168,13 +168,11 @@ check (const struct listbox_test test) WCHAR *txtw; int resA, resW; - txt = HeapAlloc (GetProcessHeap(), 0, size+1); - memset(txt, 0, size+1); + txt = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, size+1); resA=SendMessageA(hLB, LB_GETTEXT, i, (LPARAM)txt); ok(!strcmp (txt, strings[i]), "returned string for item %d does not match %s vs %s\n", i, txt, strings[i]); - txtw = HeapAlloc (GetProcessHeap(), 0, 2*size+2); - memset(txtw, 0, 2*size+2); + txtw = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, 2*size+2); resW=SendMessageW(hLB, LB_GETTEXT, i, (LPARAM)txtw); if (resA != resW) { trace("SendMessageW(LB_GETTEXT) not supported on this platform (resA=%d resW=%d), skipping...\n",

1 0

Alexandre Julliard : ntdll: Support delayed loading of modules referenced by forwarded entry points.
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: 0861141725827ddc378665d7cc570362ddc172be URL: http://source.winehq.org/git/wine.git/?a=commit;h=0861141725827ddc378665d7c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 6 21:40:37 2007 +0100 ntdll: Support delayed loading of modules referenced by forwarded entry points. --- dlls/ntdll/loader.c | 48 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 33 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index ca1ebdd..05538a0 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -115,8 +115,9 @@ static WINE_MODREF *current_modref; static WINE_MODREF *last_failed_modref; static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_MODREF** pwm ); +static NTSTATUS process_attach( WINE_MODREF *wm, LPVOID lpReserved ); static FARPROC find_named_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, - DWORD exp_size, const char *name, int hint ); + DWORD exp_size, const char *name, int hint, LPCWSTR load_path ); /* convert PE image VirtualAddress to Real Address */ static inline void *get_rva( HMODULE module, DWORD va ) @@ -330,7 +331,7 @@ static WINE_MODREF *find_fullname_module( LPCWSTR name ) * Find the final function pointer for a forwarded function. * The loader_section must be locked while calling this function. */ -static FARPROC find_forwarded_export( HMODULE module, const char *forward ) +static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWSTR load_path ) { const IMAGE_EXPORT_DIRECTORY *exports; DWORD exp_size; @@ -351,13 +352,27 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward ) if (!(wm = find_basename_module( mod_name ))) { - ERR("module not found for forward '%s' used by %s\n", - forward, debugstr_w(get_modref(module)->ldr.FullDllName.Buffer) ); - return NULL; + TRACE( "delay loading %s for '%s'\n", debugstr_w(mod_name), forward ); + if (load_dll( load_path, mod_name, 0, &wm ) == STATUS_SUCCESS && + !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) + { + if (process_attach( wm, NULL ) != STATUS_SUCCESS) + { + LdrUnloadDll( wm->ldr.BaseAddress ); + wm = NULL; + } + } + + if (!wm) + { + ERR( "module not found for forward '%s' used by %s\n", + forward, debugstr_w(get_modref(module)->ldr.FullDllName.Buffer) ); + return NULL; + } } if ((exports = RtlImageDirectoryEntryToData( wm->ldr.BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) - proc = find_named_export( wm->ldr.BaseAddress, exports, exp_size, end + 1, -1 ); + proc = find_named_export( wm->ldr.BaseAddress, exports, exp_size, end + 1, -1, load_path ); if (!proc) { @@ -378,7 +393,7 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward ) * The loader_section must be locked while calling this function. */ static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, - DWORD exp_size, DWORD ordinal ) + DWORD exp_size, DWORD ordinal, LPCWSTR load_path ) { FARPROC proc; const DWORD *functions = get_rva( module, exports->AddressOfFunctions ); @@ -395,7 +410,7 @@ static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY /* if the address falls into the export dir, it's a forward */ if (((const char *)proc >= (const char *)exports) && ((const char *)proc < (const char *)exports + exp_size)) - return find_forwarded_export( module, (const char *)proc ); + return find_forwarded_export( module, (const char *)proc, load_path ); if (TRACE_ON(snoop)) { @@ -418,7 +433,7 @@ static FARPROC find_ordinal_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY * The loader_section must be locked while calling this function. */ static FARPROC find_named_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY *exports, - DWORD exp_size, const char *name, int hint ) + DWORD exp_size, const char *name, int hint, LPCWSTR load_path ) { const WORD *ordinals = get_rva( module, exports->AddressOfNameOrdinals ); const DWORD *names = get_rva( module, exports->AddressOfNames ); @@ -429,7 +444,7 @@ static FARPROC find_named_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY * { char *ename = get_rva( module, names[hint] ); if (!strcmp( ename, name )) - return find_ordinal_export( module, exports, exp_size, ordinals[hint] ); + return find_ordinal_export( module, exports, exp_size, ordinals[hint], load_path ); } /* then do a binary search */ @@ -438,7 +453,7 @@ static FARPROC find_named_export( HMODULE module, const IMAGE_EXPORT_DIRECTORY * int res, pos = (min + max) / 2; char *ename = get_rva( module, names[pos] ); if (!(res = strcmp( ename, name ))) - return find_ordinal_export( module, exports, exp_size, ordinals[pos] ); + return find_ordinal_export( module, exports, exp_size, ordinals[pos], load_path ); if (res > 0) max = pos - 1; else min = pos + 1; } @@ -548,7 +563,7 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d int ordinal = IMAGE_ORDINAL(import_list->u1.Ordinal); thunk_list->u1.Function = (ULONG_PTR)find_ordinal_export( imp_mod, exports, exp_size, - ordinal - exports->Base ); + ordinal - exports->Base, load_path ); if (!thunk_list->u1.Function) { thunk_list->u1.Function = allocate_stub( name, IntToPtr(ordinal) ); @@ -563,7 +578,8 @@ static WINE_MODREF *import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *d IMAGE_IMPORT_BY_NAME *pe_name; pe_name = get_rva( module, (DWORD)import_list->u1.AddressOfData ); thunk_list->u1.Function = (ULONG_PTR)find_named_export( imp_mod, exports, exp_size, - (const char*)pe_name->Name, pe_name->Hint ); + (const char*)pe_name->Name, + pe_name->Hint, load_path ); if (!thunk_list->u1.Function) { thunk_list->u1.Function = allocate_stub( name, (const char*)pe_name->Name ); @@ -1196,8 +1212,9 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, else if ((exports = RtlImageDirectoryEntryToData( module, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ))) { - void *proc = name ? find_named_export( module, exports, exp_size, name->Buffer, -1 ) - : find_ordinal_export( module, exports, exp_size, ord - exports->Base ); + LPCWSTR load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; + void *proc = name ? find_named_export( module, exports, exp_size, name->Buffer, -1, load_path ) + : find_ordinal_export( module, exports, exp_size, ord - exports->Base, load_path ); if (proc) { *address = proc; @@ -1812,6 +1829,7 @@ static NTSTATUS load_dll( LPCWSTR load_path, LPCWSTR libname, DWORD flags, WINE_ TRACE( "looking for %s in %s\n", debugstr_w(libname), debugstr_w(load_path) ); + *pwm = NULL; filename = buffer; size = sizeof(buffer); for (;;)

1 0

Alexandre Julliard : winebuild: Also optimize out imports that are only used for forwards.
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: 195356c0981709e090201944f35298f48b7a7346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=195356c0981709e090201944f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 6 21:44:45 2007 +0100 winebuild: Also optimize out imports that are only used for forwards. --- tools/winebuild/import.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index a1fdbd0..5b62512 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -617,10 +617,11 @@ int resolve_imports( DLLSPEC *spec ) } } } - if (!removed && check_unused( imp, spec )) + if (!removed) { /* the dll is not used, get rid of it */ - warning( "winebuild: %s imported but no symbols used\n", imp->spec->file_name ); + if (check_unused( imp, spec )) + warning( "winebuild: %s imported but no symbols used\n", imp->spec->file_name ); remove_import_dll( i ); i--; }

1 0

Michael Stefaniuc : winecfg: Pass HEAP_ZERO_MEMORY to HeapAlloc() instead of clearing the memory with a separate memset() call.
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: d35e57732e3b18fe74b7b340f52f3e1002efef59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d35e57732e3b18fe74b7b340f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Dec 7 01:14:13 2007 +0100 winecfg: Pass HEAP_ZERO_MEMORY to HeapAlloc() instead of clearing the memory with a separate memset() call. --- programs/winecfg/audio.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c index 39b3b07..32d8754 100644 --- a/programs/winecfg/audio.c +++ b/programs/winecfg/audio.c @@ -541,10 +541,8 @@ static void findAudioDrivers(void) if (numFound) { loadedAudioDrv = HeapReAlloc(GetProcessHeap(), 0, loadedAudioDrv, (numFound + 1) * sizeof(AUDIO_DRIVER)); CopyMemory(&loadedAudioDrv[numFound], pAudioDrv, sizeof(AUDIO_DRIVER)); - } else { - loadedAudioDrv = HeapAlloc(GetProcessHeap(), 0, sizeof(AUDIO_DRIVER)); - ZeroMemory(&loadedAudioDrv[0], sizeof(AUDIO_DRIVER)); - } + } else + loadedAudioDrv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AUDIO_DRIVER)); } /* check local copy of registry string for unloadable drivers */

1 0

Alexandre Julliard : Removed some unneeded imports.
by Alexandre Julliard 07 Dec '07

07 Dec '07

1 0

Alexandre Julliard : winebuild: Print a warning when failing to import a data export.
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: 32fc1acb1c26adc200d45df074459c1ba6126bb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32fc1acb1c26adc200d45df07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 6 21:14:07 2007 +0100 winebuild: Print a warning when failing to import a data export. --- tools/winebuild/import.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 1e9cfe3..4487921 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -254,19 +254,13 @@ static int read_import_lib( struct import *imp ) nb_delayed++; } - imp->exports = xmalloc( spec->nb_entry_points * sizeof(*imp->exports) ); - - for (i = 0; i < spec->nb_entry_points; i++) + if (spec->nb_entry_points) { - ORDDEF *odp = &spec->entry_points[i]; - - if (odp->type != TYPE_STDCALL && odp->type != TYPE_CDECL) continue; - if (odp->flags & FLAG_PRIVATE) continue; - imp->exports[imp->nb_exports++] = odp; - } - imp->exports = xrealloc( imp->exports, imp->nb_exports * sizeof(*imp->exports) ); - if (imp->nb_exports) + imp->exports = xmalloc( spec->nb_entry_points * sizeof(*imp->exports) ); + for (i = 0; i < spec->nb_entry_points; i++) + imp->exports[imp->nb_exports++] = &spec->entry_points[i]; qsort( imp->exports, imp->nb_exports, sizeof(*imp->exports), func_cmp ); + } return 1; } @@ -614,15 +608,22 @@ int resolve_imports( DLLSPEC *spec ) odp = find_export( undef_symbols.names[j], imp->exports, imp->nb_exports ); if (odp) { - add_import_func( imp, odp ); - remove_name( &undef_symbols, j-- ); - removed++; + if (odp->flags & FLAG_PRIVATE) continue; + if (odp->type != TYPE_STDCALL && odp->type != TYPE_CDECL) + warning( "winebuild: Data export '%s' cannot be imported from %s\n", + odp->link_name, imp->spec->file_name ); + else + { + add_import_func( imp, odp ); + remove_name( &undef_symbols, j-- ); + removed++; + } } } if (!removed && check_unused( imp, spec )) { /* the dll is not used, get rid of it */ - warning( "%s imported but no symbols used\n", imp->spec->file_name ); + warning( "winebuild: %s imported but no symbols used\n", imp->spec->file_name ); remove_import_dll( i ); i--; }

1 0

Alexandre Julliard : winebuild: Improved checks for missing forward entry point targets.
by Alexandre Julliard 07 Dec '07

07 Dec '07

Module: wine Branch: master Commit: e6fe7341f503b317eacd1380a7a1529e52c49c17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6fe7341f503b317eacd1380a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 6 21:22:34 2007 +0100 winebuild: Improved checks for missing forward entry point targets. --- tools/winebuild/import.c | 55 +++++++++++++++++++++------------------------ 1 files changed, 26 insertions(+), 29 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 4487921..a1fdbd0 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -424,39 +424,39 @@ static int check_unused( const struct import* imp, const DLLSPEC *spec ) } /* check if a given forward does exist in one of the imported dlls */ -static void check_undefined_forward( DLLSPEC *spec, ORDDEF *odp ) +static void check_undefined_forwards( DLLSPEC *spec ) { char *link_name, *api_name, *dll_name, *p; - int i, found = 0; + int i, j; - assert( odp->flags & FLAG_FORWARD ); + for (i = 0; i < spec->nb_entry_points; i++) + { + ORDDEF *odp = &spec->entry_points[i]; - link_name = xstrdup( odp->link_name ); - p = strrchr( link_name, '.' ); - *p = 0; - api_name = p + 1; - dll_name = get_dll_name( link_name, NULL ); + if (!(odp->flags & FLAG_FORWARD)) continue; - for (i = 0; i < nb_imports; i++) - { - struct import *imp = dll_imports[i]; + link_name = xstrdup( odp->link_name ); + p = strrchr( link_name, '.' ); + *p = 0; + api_name = p + 1; + dll_name = get_dll_name( link_name, NULL ); - if (!strcasecmp( imp->spec->file_name, dll_name )) + for (j = 0; j < nb_imports; j++) { - if (find_export( api_name, imp->exports, imp->nb_exports )) - { - found = 1; - break; - } + struct import *imp = dll_imports[j]; + + if (strcasecmp( imp->spec->file_name, dll_name )) continue; + if (!find_export( api_name, imp->exports, imp->nb_exports )) + warning( "%s:%d: forward '%s' not found in %s\n", + spec->src_name, odp->lineno, odp->link_name, imp->spec->file_name ); + break; } + if (j == nb_imports) + warning( "%s:%d: forward '%s' not found in the imported dll list\n", + spec->src_name, odp->lineno, odp->link_name ); + free( link_name ); + free( dll_name ); } - - free( link_name ); - free( dll_name ); - - if (!found) - warning( "%s:%d: forward '%s' not found in the imported dll list\n", - spec->src_name, odp->lineno, odp->link_name ); } /* flag the dll exports that link to an undefined symbol */ @@ -468,11 +468,7 @@ static void check_undefined_exports( DLLSPEC *spec ) { ORDDEF *odp = &spec->entry_points[i]; if (odp->type == TYPE_STUB) continue; - if (odp->flags & FLAG_FORWARD) - { - check_undefined_forward( spec, odp ); - continue; - } + if (odp->flags & FLAG_FORWARD) continue; if (find_name( odp->link_name, &undef_symbols )) { switch(odp->type) @@ -597,6 +593,7 @@ int resolve_imports( DLLSPEC *spec ) ORDDEF *odp; sort_names( &ignore_symbols ); + check_undefined_forwards( spec ); for (i = 0; i < nb_imports; i++) {

1 0

Alexander Nicolaysen Sørnes : version: Only show vote link when logged in
by Chris Morgan 07 Dec '07

07 Dec '07

Module: appdb Branch: master Commit: 93c01ad56b2322fc6e059348b7eea01f5eef3785 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=93c01ad56b2322fc6e059348… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Dec 6 09:43:34 2007 +0100 version: Only show vote link when logged in --- include/version.php | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/version.php b/include/version.php index 1caeaa4..37f3d79 100644 --- a/include/version.php +++ b/include/version.php @@ -822,9 +822,13 @@ class version { $oM = new objectManager("voteManager", "Vote"); $oM->setReturnTo($this->objectMakeUrl()); // Votes + if($_SESSION['current']->isLoggedIn()) + $shVoteLink = '   <a href="'.$oM->makeUrl("edit", $_SESSION['current']->iUserId).'&iVersionId='.$this->iVersionId.'">Vote</a>'; + else + $shVoteLink = ''; echo html_tr(array( "<b>Votes</b>", - vote_count_version_total($this->iVersionId).'   <a href="'.$oM->makeUrl("edit", $_SESSION['current']->iUserId).'&iVersionId='.$this->iVersionId.'">Vote</a>'), + vote_count_version_total($this->iVersionId).$shVoteLink), "color0"); if($this->sTestedRating != "/" && $this->sTestedRating)

1 0

Alexander Nicolaysen Sørnes : Remove some no longer used voting code
by Chris Morgan 07 Dec '07

07 Dec '07

Module: appdb Branch: master Commit: 18a3b97694127009a7b164b8104005536ce811e1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=18a3b97694127009a7b164b8… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Dec 7 01:16:32 2007 +0100 Remove some no longer used voting code --- include/version.php | 4 - include/vote.php | 186 --------------------------------------------------- updatevote.php | 16 ----- 3 files changed, 0 insertions(+), 206 deletions(-) diff --git a/include/version.php b/include/version.php index 37f3d79..70c176a 100644 --- a/include/version.php +++ b/include/version.php @@ -794,10 +794,6 @@ class version { $oApp = $this->objectGetParent(); - // show Vote Menu - if($_SESSION['current']->isLoggedIn()) - apidb_sidebar_add("vote_menu"); - // cat $oCategory = new Category($oApp->iCatId); $oCategory->display($oApp->iAppId, $this->iVersionId); diff --git a/include/vote.php b/include/vote.php index e636571..c97295e 100644 --- a/include/vote.php +++ b/include/vote.php @@ -239,24 +239,6 @@ function vote_count($iVersionId, $iUserId = null) return query_num_rows($hResult); } - -/** - * total votes by userId - */ -function vote_count_user_total($iUserId = null) -{ - if(!$iUserId) - { - if($_SESSION['current']->isLoggedIn()) - $iUserId = $_SESSION['current']->iUserId; - else - return 0; - } - $hResult = query_parameters("SELECT * FROM appVotes WHERE userId = '?'", $iUserId); - return query_num_rows($hResult); -} - - /* * total votes for versionId */ @@ -267,172 +249,4 @@ function vote_count_version_total($iVersionId) return query_num_rows($hResult); } - -/** - * add a vote for appId - */ -function vote_add($iVersionId, $iSlot, $iUserId = null) -{ - if(!$iUserId) - { - if($_SESSION['current']->isLoggedIn()) - $iUserId = $_SESSION['current']->iUserId; - else - return; - } - - if($iSlot > MAX_VOTES) - return; - - vote_remove($iSlot, $iUserId); - - query_parameters("INSERT INTO appVotes (id, time, versionId, userId, slot) - VALUES (?, ?, '?', '?', '?')", "null", "NOW()", - $iVersionId, $iUserId, $iSlot); -} - - -/** - * remove vote for a slot - */ -function vote_remove($iSlot, $iUserId = null) -{ - if(!$iUserId) - { - if($_SESSION['current']->isLoggedIn()) - $iUserId = $_SESSION['current']->iUserId; - else - return; - } - - $sQuery = "DELETE FROM appVotes WHERE userId = '?' AND slot = '?'"; - query_parameters($sQuery, $iUserId, $iSlot); -} - - -function vote_get_user_votes($iUserId = null) -{ - if(!$iUserId) - { - if($_SESSION['current']->isLoggedIn()) - $iUserId = $_SESSION['current']->iUserId; - if(!$iUserId) - return array(); - } - $hResult = query_parameters("SELECT * FROM appVotes WHERE userId = '?'", $iUserId); - if(!$hResult) - return array(); - - $obs = array(); - while($oRow = query_fetch_object($hResult)) - $obs[$oRow->slot] = $oRow; - return $obs; -} - - -function vote_menu() -{ - global $aClean; - - $m = new htmlmenu("Votes","updatevote.php"); - - $oVersion = new version($aClean['iVersionId']); - - if($oVersion->iObsoleteBy) - { - $m->add("This version is marked as obsolete, so you cannot vote for it."); - } else - { - $votes = vote_get_user_votes(); - - for($i = 1;$i <= MAX_VOTES; $i++) - { - if(isset($votes[$i])) - $str = Version::fullNameLink($votes[$i]->versionId); - else - $str = "No App Selected"; - - $m->add("<input type=radio name=iSlot value='$i'> $str"); - } - - $m->addmisc(" "); - - $m->add("<input type=submit name=sClear value=' Clear Vote ' class=votebutton>"); - $m->add("<input type=submit name=sVote value='Vote for App' class=votebutton>"); - - $m->addmisc("<input type=hidden name=iVersionId value={$aClean['iVersionId']}>"); - - $m->add("View Results", BASE."votestats.php"); - $m->add("Voting Help", BASE."help/?sTopic=voting"); - } - - $m->done(1); -} - - -function vote_update($vars) -{ - if(!$_SESSION['current']->isLoggedIn()) - util_show_error_page_and_exit("You must be logged in to vote"); - - $oVersion = new version($vars['iVersionId']); - - if( !is_numeric($vars['iVersionId']) OR !is_numeric($vars['iSlot'])) - { - if(is_numeric($vars['iVersionId'])) - { - addmsg("You need to select a voting slot", "red"); - util_redirect_and_exit($oVersion->objectMakeUrl()); - } else - { - util_redirect_and_exit(apidb_fullurl("index.php")); - } - - return; - } - - if($vars["sVote"]) - { - addmsg("Registered vote for App #".$vars['iVersionId'], "green"); - vote_add($vars['iVersionId'], $vars['iSlot']); - } else if($vars['sClear']) - { - /* see if we have a vote in this slot, if we don't there is */ - /* little reason to remove it or even mention that we did anything */ - if(is_vote_in_slot($vars['iSlot'])) - { - vote_remove($vars['iSlot']); - addmsg("Removed vote for App #".$vars['iVersionId'], "green"); - } - } - - util_redirect_and_exit($oVersion->objectMakeUrl()); -} - -// tell us if there is a vote in a given slot so we don't -// display incorrect information to the user or go -// through the trouble of trying to remove a vote that doesn't exist -function is_vote_in_slot($iSlot, $iUserId = null) -{ - if(!$iUserId) - { - if($_SESSION['current']->isLoggedIn()) - $iUserId = $_SESSION['current']->iUserId; - else - return; - } - - $sQuery = "SELECT COUNT(*) as count from appVotes WHERE userId = '?' AND slot = '?'"; - if($hResult = query_parameters($sQuery, $iUserId, $iSlot)) - { - $oRow = query_fetch_object($hResult); - if($oRow->count != 0) - return true; - else - return false; - } - - return false; -} - ?> diff --git a/updatevote.php b/updatevote.php deleted file mode 100644 index 516f50e..0000000 --- a/updatevote.php +++ /dev/null @@ -1,16 +0,0 @@ -<?php -/*************************/ -/* code to modify voting */ -/*************************/ - -/* - * application environment - */ -require("path.php"); -require(BASE."include/incl.php"); -require(BASE."include/vote.php"); - -vote_update($aClean); - -apidb_footer(); -?>

1 0