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

Dan Hipschman : widl: Fix a write_parameters_init bug.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: 58dea5c9a833b6587944d36f02a59ff4794fed29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58dea5c9a833b6587944d36f0… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Jun 14 18:30:26 2007 -0700 widl: Fix a write_parameters_init bug. --- tools/widl/proxy.c | 2 +- tools/widl/server.c | 24 +----------------------- tools/widl/typegen.c | 20 ++++++++++++++++++++ tools/widl/typegen.h | 2 +- 4 files changed, 23 insertions(+), 25 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 93eddf5..4911caf 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -367,7 +367,7 @@ static void gen_stub(type_t *iface, const func_t *cur, const char *cas, print_proxy("NdrStubInitialize(_pRpcMessage, &_StubMsg, &Object_StubDesc, _pRpcChannelBuffer);\n"); fprintf(proxy, "\n"); - write_parameters_init(cur); + write_parameters_init(proxy, indent, cur); print_proxy("RpcTryFinally\n"); print_proxy("{\n"); diff --git a/tools/widl/server.c b/tools/widl/server.c index e3740ce..fd94c9a 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -54,28 +54,6 @@ static void print_server(const char *format, ...) va_end(va); } - -void write_parameters_init(const func_t *func) -{ - const var_t *var; - - if (!func->args) - return; - - LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) - { - const type_t *t = var->type; - const char *n = var->name; - if (decl_indirect(t)) - print_server("MIDL_memset(&%s, 0, sizeof %s);\n", n, n); - else if (is_ptr(t) || is_array(t)) - print_server("%s = 0;\n", n); - } - - fprintf(server, "\n"); -} - - static void write_function_stubs(type_t *iface, unsigned int *proc_offset) { char *implicit_handle = get_attrp(iface->attrs, ATTR_IMPLICIT_HANDLE); @@ -137,7 +115,7 @@ static void write_function_stubs(type_t *iface, unsigned int *proc_offset) indent--; fprintf(server, "\n"); - write_parameters_init(func); + write_parameters_init(server, indent, func); if (explicit_handle_var) { diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 6da96f5..a1e4e6d 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -273,6 +273,26 @@ void print(FILE *file, int indent, const char *format, va_list va) } } +void write_parameters_init(FILE *file, int indent, const func_t *func) +{ + const var_t *var; + + if (!func->args) + return; + + LIST_FOR_EACH_ENTRY( var, func->args, const var_t, entry ) + { + const type_t *t = var->type; + const char *n = var->name; + if (decl_indirect(t)) + print_file(file, indent, "MIDL_memset(&%s, 0, sizeof %s);\n", n, n); + else if (is_ptr(t) || is_array(t)) + print_file(file, indent, "%s = 0;\n", n); + } + + fprintf(file, "\n"); +} + static void write_formatdesc(FILE *f, int indent, const char *str) { print_file(f, indent, "typedef struct _MIDL_%s_FORMAT_STRING\n", str); diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index 77b207e..eefecd7 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -53,5 +53,5 @@ void write_user_quad_list(FILE *file); void write_endpoints( FILE *f, const char *prefix, const str_list_t *list ); size_t type_memsize(const type_t *t, unsigned int *align); int decl_indirect(const type_t *t); -void write_parameters_init(const func_t *func); +void write_parameters_init(FILE *file, int indent, const func_t *func); void print(FILE *file, int indent, const char *format, va_list ap);

1 0

John Klehm : include: Allow port.h to build on gcc4.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: 3c3a879a86a9cb2fcf5d02a26851b9200f502e8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c3a879a86a9cb2fcf5d02a26… Author: John Klehm <xixsimplicityxix(a)gmail.com> Date: Thu Jun 14 13:32:39 2007 -0500 include: Allow port.h to build on gcc4. --- include/wine/port.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 6ab0627..b8009cc 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -276,7 +276,7 @@ int ffs( int x ); #ifndef HAVE_FUTIMES struct timeval; -int futimes(int fd, const struct timeval tv[2]); +int futimes(int fd, const struct timeval *tv); #endif #ifndef HAVE_GETPAGESIZE

1 0

Damjan Jovanovic : ws2_32: getsockname should fail on unbound socket.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: 1cf9436efe47b858a4cae33c956a78b8bcf83fbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cf9436efe47b858a4cae33c9… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 14 15:27:29 2007 +0200 ws2_32: getsockname should fail on unbound socket. --- dlls/ws2_32/socket.c | 33 +++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 10 ++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 456be21..aab3888 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -927,6 +927,35 @@ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsadd return uaddrlen; } +static BOOL is_sockaddr_bound(const struct sockaddr *uaddr, int uaddrlen) +{ + switch (uaddr->sa_family) + { +#ifdef HAVE_IPX + case AF_IPX: + FIXME("don't know how to tell if IPX socket is bound, assuming it is!\n"); + return TRUE; +#endif + case AF_INET6: + { + static const struct sockaddr_in6 emptyAddr; + const struct sockaddr_in6 *in6 = (const struct sockaddr_in6*) uaddr; + return in6->sin6_port || memcmp(&in6->sin6_addr, &emptyAddr.sin6_addr, sizeof(struct in6_addr)); + } + case AF_INET: + { + static const struct sockaddr_in emptyAddr; + const struct sockaddr_in *in = (const struct sockaddr_in*) uaddr; + return in->sin_port || memcmp(&in->sin_addr, &emptyAddr.sin_addr, sizeof(struct in_addr)); + } + case AF_UNSPEC: + return FALSE; + default: + FIXME("unknown address family %d\n", uaddr->sa_family); + return TRUE; + } +} + /* Returns 0 if successful, -1 if the buffer is too small */ static int ws_sockaddr_u2ws(const struct sockaddr* uaddr, struct WS_sockaddr* wsaddr, int* wsaddrlen) { @@ -1590,6 +1619,10 @@ int WINAPI WS_getsockname(SOCKET s, struct WS_sockaddr *name, int *namelen) { SetLastError(wsaErrno()); } + else if (!is_sockaddr_bound(&uaddr.addr, uaddrlen)) + { + SetLastError(WSAEINVAL); + } else if (ws_sockaddr_u2ws(&uaddr.addr, name, namelen) != 0) { /* The buffer was too small */ diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3403715..cc41320 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1644,6 +1644,16 @@ static void test_getsockname(void) return; } + memcpy(&sa_get, &sa_set, sizeof(sa_set)); + if (getsockname(sock, (struct sockaddr*) &sa_get, &sa_get_len) == 0) + ok(0, "getsockname on unbound socket should fail\n"); + else { + ok(WSAGetLastError() == WSAEINVAL, "getsockname on unbound socket " + "failed with %d, expected %d\n", WSAGetLastError(), WSAEINVAL); + ok(memcmp(&sa_get, &sa_set, sizeof(sa_get)) == 0, + "failed getsockname modified sockaddr when it shouldn't\n"); + } + if(bind(sock, (struct sockaddr *) &sa_set, sa_set_len) < 0){ trace("Failed to bind socket: %d\n", WSAGetLastError()); closesocket(sock);

1 0

Dan Hipschman : widl: Handle embedded interface pointers.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: 8709a06028709b11ade91087c1bdba8678adc65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8709a06028709b11ade91087c… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Jun 14 18:27:19 2007 -0700 widl: Handle embedded interface pointers. --- tools/widl/parser.y | 15 ++++++++++++++- tools/widl/typegen.c | 43 ++++++++++++++++++++++++++----------------- 2 files changed, 40 insertions(+), 18 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index a991cad..739b60c 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -1668,8 +1668,21 @@ static int get_struct_type(var_list_t *fields) { type_t *t = field->type; - if (is_ptr(field->type)) + if (is_ptr(t)) { + do + t = t->ref; + while (is_ptr(t)); + + switch (t->type) + { + case RPC_FC_IP: + case RPC_FC_ENCAPSULATED_UNION: + case RPC_FC_NON_ENCAPSULATED_UNION: + case RPC_FC_BOGUS_STRUCT: + return RPC_FC_BOGUS_STRUCT; + } + has_pointer = 1; continue; } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 6f12a22..9a5910a 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -195,7 +195,8 @@ static int is_user_type(const type_t *t) static int is_embedded_complex(const type_t *type) { unsigned char tc = type->type; - return is_struct(tc) || is_union(tc) || is_array(type) || is_user_type(type); + return is_struct(tc) || is_union(tc) || is_array(type) || is_user_type(type) + || (is_ptr(type) && type->ref->type == RPC_FC_IP); } static int compare_expr(const expr_t *a, const expr_t *b) @@ -879,12 +880,7 @@ static void write_user_tfs(FILE *file, type_t *type, unsigned int *tfsoff) static void write_member_type(FILE *file, type_t *type, const var_t *field, unsigned int *corroff, unsigned int *tfsoff) { - if (is_ptr(type)) - { - print_file(file, 2, "0x8,\t/* FC_LONG */\n"); - *tfsoff += 1; - } - else if (is_embedded_complex(type)) + if (is_embedded_complex(type)) { size_t absoff; short reloff; @@ -907,6 +903,11 @@ static void write_member_type(FILE *file, type_t *type, const var_t *field, reloff, reloff, absoff); *tfsoff += 4; } + else if (is_ptr(type)) + { + print_file(file, 2, "0x8,\t/* FC_LONG */\n"); + *tfsoff += 1; + } else if (!write_base_type(file, type, tfsoff)) error("Unsupported member type 0x%x\n", type->type); } @@ -1415,12 +1416,12 @@ static size_t write_union_tfs(FILE *file, type_t *type, unsigned int *tfsoff) return start_offset; } -static size_t write_ip_tfs(FILE *file, const func_t *func, const type_t *type, const var_t *var, - unsigned int *typeformat_offset) +static size_t write_ip_tfs(FILE *file, const func_t *func, const attr_list_t *attrs, + type_t *type, unsigned int *typeformat_offset) { size_t i; size_t start_offset = *typeformat_offset; - const var_t *iid = get_attrp(var->attrs, ATTR_IIDIS); + const var_t *iid = get_attrp(attrs, ATTR_IIDIS); if (iid) { @@ -1442,6 +1443,8 @@ static size_t write_ip_tfs(FILE *file, const func_t *func, const type_t *type, c if (! uuid) error("%s: interface %s missing UUID\n", __FUNCTION__, base->name); + update_tfsoff(type, start_offset, file); + print_file(file, 0, "/* %d */\n", start_offset); print_file(file, 2, "0x2f,\t/* FC_IP */\n"); print_file(file, 2, "0x5a,\t/* FC_CONSTANT_IID */\n"); print_file(file, 2, "NdrFcLong(0x%08lx),\n", uuid->Data1); @@ -1539,7 +1542,7 @@ static size_t write_typeformatstring_var(FILE *file, int indent, const func_t *f if (base->type == RPC_FC_IP) { - return write_ip_tfs(file, func, type, var, typeformat_offset); + return write_ip_tfs(file, func, var->attrs, type, typeformat_offset); } /* special case for pointers to base types */ @@ -1609,14 +1612,20 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty { type_t *ref = type->ref; - if (!processed(ref) && !is_base_type(ref->type)) - retmask |= write_embedded_types(file, NULL, ref, name, TRUE, tfsoff); + if (ref->type == RPC_FC_IP) + { + write_ip_tfs(file, NULL, attrs, type, tfsoff); + } + else + { + if (!processed(ref) && !is_base_type(ref->type)) + retmask |= write_embedded_types(file, NULL, ref, name, TRUE, tfsoff); - /* top-level pointers are handled inline for structures */ - if (write_ptr) - write_pointer_tfs(file, type, tfsoff); + if (write_ptr) + write_pointer_tfs(file, type, tfsoff); - retmask |= 1; + retmask |= 1; + } } else if (type->declarray && is_conformant_array(type)) ; /* conformant arrays and strings are handled specially */

1 0

Dan Hipschman : widl: Handle encapsulated unions.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: e4679b0c139c83a8e3ceff8033d4442b6f772c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4679b0c139c83a8e3ceff803… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Jun 14 18:28:03 2007 -0700 widl: Handle encapsulated unions. --- tools/widl/parser.y | 2 +- tools/widl/typegen.c | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 739b60c..5f30ccc 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -509,7 +509,7 @@ cases: { $$ = NULL; } | cases case { $$ = append_var( $1, $2 ); } ; -case: tCASE expr ':' field { attr_t *a = make_attrp(ATTR_CASE, $2); +case: tCASE expr ':' field { attr_t *a = make_attrp(ATTR_CASE, append_expr( NULL, $2 )); $$ = $4; if (!$$) $$ = make_var(NULL); $$->attrs = append_attr( $$->attrs, a ); } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 9a5910a..67872f0 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -1327,7 +1327,11 @@ static size_t write_pointer_only_tfs(FILE *file, const attr_list_t *attrs, int p static void write_branch_type(FILE *file, const type_t *t, unsigned int *tfsoff) { - if (is_base_type(t->type)) + if (t == NULL) + { + print_file(file, 2, "NdrFcShort(0x0),\t/* No type */\n"); + } + else if (is_base_type(t->type)) { print_file(file, 2, "NdrFcShort(0x80%02x),\t/* Simple arm type: %s */\n", t->type, string_of_type(t->type)); @@ -1349,7 +1353,7 @@ static size_t write_union_tfs(FILE *file, type_t *type, unsigned int *tfsoff) unsigned int align = 0; unsigned int start_offset; size_t size = type_memsize(type, &align); - var_list_t *fields = type->fields; + var_list_t *fields; size_t nbranch = 0; type_t *deftype = NULL; short nodeftype = 0xffff; @@ -1357,6 +1361,14 @@ static size_t write_union_tfs(FILE *file, type_t *type, unsigned int *tfsoff) guard_rec(type); + if (type->type == RPC_FC_ENCAPSULATED_UNION) + { + const var_t *uv = LIST_ENTRY(list_tail(type->fields), const var_t, entry); + fields = uv->type->fields; + } + else + fields = type->fields; + if (fields) LIST_FOR_EACH_ENTRY(f, fields, var_t, entry) { expr_list_t *cases = get_attrp(f->attrs, ATTR_CASE); @@ -1369,6 +1381,17 @@ static size_t write_union_tfs(FILE *file, type_t *type, unsigned int *tfsoff) start_offset = *tfsoff; update_tfsoff(type, start_offset, file); print_file(file, 0, "/* %d */\n", start_offset); + if (type->type == RPC_FC_ENCAPSULATED_UNION) + { + const var_t *sv = LIST_ENTRY(list_head(type->fields), const var_t, entry); + const type_t *st = sv->type; + size_t ss = type_memsize(st, &align); + + print_file(file, 2, "0x%x,\t/* %s */\n", type->type, string_of_type(type->type)); + print_file(file, 2, "0x%x,\t/* Switch type= %s */\n", + (ss << 4) | st->type, string_of_type(st->type)); + *tfsoff += 2; + } print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", size, size); print_file(file, 2, "NdrFcShort(0x%x),\t/* %d */\n", nbranch, nbranch); *tfsoff += 4;

1 0

Dan Hipschman : widl: Factor the output functions.
by Alexandre Julliard 15 Jun '07

15 Jun '07

Module: wine Branch: master Commit: e36981e1168e2f4639fd71202a65252dfb1b555e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e36981e1168e2f4639fd71202… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu Jun 14 18:29:33 2007 -0700 widl: Factor the output functions. --- tools/widl/client.c | 10 ++-------- tools/widl/proxy.c | 10 ++-------- tools/widl/server.c | 10 ++-------- tools/widl/typegen.c | 22 +++++++++++++--------- tools/widl/typegen.h | 2 ++ 5 files changed, 21 insertions(+), 33 deletions(-) diff --git a/tools/widl/client.c b/tools/widl/client.c index 6172cfe..86ead20 100644 --- a/tools/widl/client.c +++ b/tools/widl/client.c @@ -44,18 +44,12 @@ static FILE* client; static int indent = 0; -static int print_client( const char *format, ... ) +static void print_client( const char *format, ... ) { va_list va; - int i, r; - va_start(va, format); - if (format[0] != '\n') - for (i = 0; i < indent; i++) - fprintf(client, " "); - r = vfprintf(client, format, va); + print(client, indent, format, va); va_end(va); - return r; } diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 72f1f9d..93eddf5 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -51,18 +51,12 @@ static int indent = 0; /* FIXME: support generation of stubless proxies */ -static int print_proxy( const char *format, ... ) +static void print_proxy( const char *format, ... ) { va_list va; - int i, r; - va_start( va, format ); - if ( format[0] != '\n' ) - for( i=0; i<indent; i++ ) - fprintf( proxy, " " ); - r = vfprintf( proxy, format, va ); + print( proxy, indent, format, va ); va_end( va ); - return r; } static void write_stubdescproto(void) diff --git a/tools/widl/server.c b/tools/widl/server.c index f85a5bb..e3740ce 100644 --- a/tools/widl/server.c +++ b/tools/widl/server.c @@ -46,18 +46,12 @@ static FILE* server; static int indent = 0; -static int print_server(const char *format, ...) +static void print_server(const char *format, ...) { va_list va; - int i, r; - va_start(va, format); - if (format[0] != '\n') - for (i = 0; i < indent; i++) - fprintf(server, " "); - r = vfprintf(server, format, va); + print(server, indent, format, va); va_end(va); - return r; } diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 67872f0..6da96f5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -254,19 +254,23 @@ static int compare_expr(const expr_t *a, const expr_t *b) } \ while (0) -static int print_file(FILE *file, int indent, const char *format, ...) +static void print_file(FILE *file, int indent, const char *format, ...) { va_list va; - int i, r; - - if (!file) return 0; - va_start(va, format); - for (i = 0; i < indent; i++) - fprintf(file, " "); - r = vfprintf(file, format, va); + print(file, indent, format, va); va_end(va); - return r; +} + +void print(FILE *file, int indent, const char *format, va_list va) +{ + if (file) + { + if (format[0] != '\n') + while (0 < indent--) + fprintf(file, " "); + vfprintf(file, format, va); + } } static void write_formatdesc(FILE *f, int indent, const char *str) diff --git a/tools/widl/typegen.h b/tools/widl/typegen.h index be97d01..77b207e 100644 --- a/tools/widl/typegen.h +++ b/tools/widl/typegen.h @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <stdarg.h> enum pass { @@ -53,3 +54,4 @@ void write_endpoints( FILE *f, const char *prefix, const str_list_t *list ); size_t type_memsize(const type_t *t, unsigned int *align); int decl_indirect(const type_t *t); void write_parameters_init(const func_t *func); +void print(FILE *file, int indent, const char *format, va_list ap);

1 0

appdb/cron cleanup.php
by WineHQ 15 Jun '07

15 Jun '07

ChangeSet ID: 31202 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/14 23:54:57 Modified files: cron : cleanup.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Assign the admin user to $SESSION['current'] Patch: http://cvs.winehq.org/patch.py?id=31202 Old revision New revision Changes Path 1.41 1.42 +1 -0 appdb/cron/cleanup.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.41 appdb/cron/cleanup.php:1.42 --- appdb/cron/cleanup.php:1.41 15 Jun 2007 4:54:57 -0000 +++ appdb/cron/cleanup.php 15 Jun 2007 4:54:57 -0000 @@ -319,6 +319,7 @@ function removeScreenshotsWithMissingFil // access to delete these screenshots $oUser = new User(); $oUser->iUserId = 1000; + $_SESSION['current'] = $oUser; // remove the screenshots with missing files foreach($aMissingScreenshotIds as $iScreenshotId)

1 0

appdb/cron cleanup.php
by WineHQ 15 Jun '07

15 Jun '07

ChangeSet ID: 31201 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/14 23:35:23 Modified files: cron : cleanup.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix typo Patch: http://cvs.winehq.org/patch.py?id=31201 Old revision New revision Changes Path 1.40 1.41 +1 -1 appdb/cron/cleanup.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.40 appdb/cron/cleanup.php:1.41 --- appdb/cron/cleanup.php:1.40 15 Jun 2007 4:35:23 -0000 +++ appdb/cron/cleanup.php 15 Jun 2007 4:35:23 -0000 @@ -328,6 +328,6 @@ function removeScreenshotsWithMissingFil } // log out as user - $oUser->logout() + $oUser->logout(); } ?>

1 0

appdb/cron cleanup.php
by WineHQ 15 Jun '07

15 Jun '07

ChangeSet ID: 31200 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/14 23:28:00 Modified files: cron : cleanup.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Login as an admin user during cron maintenance so we can delete screenshots Patch: http://cvs.winehq.org/patch.py?id=31200 Old revision New revision Changes Path 1.39 1.40 +9 -0 appdb/cron/cleanup.php Index: appdb/cron/cleanup.php diff -u -p appdb/cron/cleanup.php:1.39 appdb/cron/cleanup.php:1.40 --- appdb/cron/cleanup.php:1.39 15 Jun 2007 4:28: 0 -0000 +++ appdb/cron/cleanup.php 15 Jun 2007 4:28: 0 -0000 @@ -314,11 +314,20 @@ function removeScreenshotsWithMissingFil if($sEmail) mail_appdb($sEmail, $sSubject, $sMsg); + // log in as admin user with user id 1000 + // NOTE: this is a bit of a hack but we need admin + // access to delete these screenshots + $oUser = new User(); + $oUser->iUserId = 1000; + // remove the screenshots with missing files foreach($aMissingScreenshotIds as $iScreenshotId) { $oScreenshot = new Screenshot($iScreenshotId); $oScreenshot->delete(); // delete the screenshot } + + // log out as user + $oUser->logout() } ?>

1 0

appdb/ ./objectManager.php include/objectManag ...
by WineHQ 15 Jun '07

15 Jun '07

ChangeSet ID: 31199 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/06/14 23:10:42 Modified files: . : objectManager.php include : objectManager.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Remember multipage values when processing entries Patch: http://cvs.winehq.org/patch.py?id=31199 Old revision New revision Changes Path 1.14 1.15 +2 -0 appdb/objectManager.php 1.28 1.29 +40 -8 appdb/include/objectManager.php Index: appdb/objectManager.php diff -u -p appdb/objectManager.php:1.14 appdb/objectManager.php:1.15 --- appdb/objectManager.php:1.14 15 Jun 2007 4:10:42 -0000 +++ appdb/objectManager.php 15 Jun 2007 4:10:42 -0000 @@ -52,6 +52,8 @@ if($aClean['bIsRejected'] == 'true') } else $oObject->bIsRejected = false; +$oObject->oMultiPage->getDataFromInput($aClean); + $oOtherObject = new $oObject->sClass($oObject->iId); /* Certain actions must be performed before the header is set. */ Index: appdb/include/objectManager.php diff -u -p appdb/include/objectManager.php:1.28 appdb/include/objectManager.php:1.29 --- appdb/include/objectManager.php:1.28 15 Jun 2007 4:10:42 -0000 +++ appdb/include/objectManager.php 15 Jun 2007 4:10:42 -0000 @@ -544,22 +544,34 @@ class ObjectManager /* Make an objectManager URL based on the object and optional parameters */ function makeUrl($sAction = false, $iId = false, $sTitle = false) { + $sUrl = APPDB_ROOT."objectManager.php?"; + + $sIsQueue = $this->bIsQueue ? "true" : "false"; + $sUrl .= "bIsQueue=$sIsQueue"; + $sIsRejected = $this->bIsRejected ? "true" : "false"; + $sUrl .= "&bIsRejected=$sIsRejected"; + + $sUrl .= "&sClass=".$this->sClass; if($iId) - $sId = "&iId=$iId"; + $sUrl .= "&iId=$iId"; if($sAction) - $sAction = "&sAction=$sAction"; + $sUrl .= "&sAction=$sAction"; + - $sIsQueue = $this->bIsQueue ? "true" : "false"; - $sIsRejected = $this->bIsRejected ? "true" : "false"; if(!$sTitle) $sTitle = $this->sTitle; - $sTitle = urlencode($sTitle); + $sUrl .= "&sTitle=".urlencode($sTitle); + + if($this->oMultiPage->bEnabled) + { + $sUrl .= "&iItemsPerPage=".$this->oMultiPage->iItemsPerPage; + $sUrl .= "&iPage=".$this->oMultiPage->iPage; + } - return APPDB_ROOT."objectManager.php?bIsQueue=$sIsQueue&sClass=$this->sClass". - "&sTitle=$sTitle$sId$sAction&bIsRejected=$sIsRejected"; + return $sUrl; } /* Inserts the information in an objectManager object as form data, so that it @@ -574,6 +586,14 @@ class ObjectManager $sReturn .= "<input type=\"hidden\" name=\"sClass\" value=\"".$this->sClass."\" />\n"; $sReturn .= "<input type=\"hidden\" name=\"sTitle\" value=\"".$this->sTitle."\" />\n"; + if($this->oMultiPage->bEnabled) + { + $sReturn .= "<input type=\"hidden\" name=\"iItemsPerPage\" value=\"". + $this->oMultiPage->iItemsPerPage."\" />\n"; + $sReturn .= "<input type=\"hidden\" name=\"iPage\" value=\"". + $this->oMultiPage->iPage."\" />\n"; + } + return $sReturn; } /* Get id from form data */ @@ -709,7 +729,8 @@ class ObjectManager class MultiPage { var $iItemsPerPage; - var $iLowerLimit; + var $iLowerLimit; /* Internal; set by handleMultiPageControls. We use iPage in the URls */ + var $iPage; var $bEnabled; function MultiPage($bEnabled = FALSE, $iItemsPerPage = 0, $iLowerLimit = 0) @@ -718,6 +739,17 @@ class MultiPage $this->iItemsPerPage = $iItemsPerPage; $this->iLowerLimit = $iLowerLimit; } + + function getDataFromInput($aClean) + { + if($aClean['iItemsPerPage'] && $aClean['iPage']) + $this->bEnabled = TRUE; + else + return; + + $this->iItemsPerPage = $aClean['iItemsPerPage']; + $this->iPage = $aClean['iPage']; + } } class TableRow

1 0