July 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : winetest: Build exe resources as separate .res files.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 0dc951694bfeceebeacbb4148e66bb663ba87d1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc951694bfeceebeacbb4148… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 4 11:20:09 2009 +0200 winetest: Build exe resources as separate .res files. --- .gitignore | 2 +- configure | 10 +++++++--- configure.ac | 10 +++++++--- programs/winetest/Makefile.in | 21 ++++++--------------- programs/winetest/winetest.rc | 2 -- tools/make_makefiles | 2 +- 6 files changed, 22 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index f096f4a..5303e1c 100644 --- a/.gitignore +++ b/.gitignore @@ -197,7 +197,7 @@ programs/winedbg/dbg.tab.h programs/winedbg/debug.yy.c programs/winedbg/winedbg.man programs/winetest/*_test.exe -programs/winetest/tests.rc +programs/winetest/*_test.rc programs/winhlp32/macro.lex.yy.c server/wineserver server/wineserver-installed diff --git a/configure b/configure index 97bb65a..9e59d11 100755 --- a/configure +++ b/configure @@ -28762,10 +28762,14 @@ for dir in $ALL_TEST_DIRS do if test "$dir" != "\\" then - testname=`expr $dir : '$.*$/tests'`_test.exe + testname=`expr $dir : '$.*$/tests'`_test ALL_WINETEST_DEPENDS="$ALL_WINETEST_DEPENDS -$testname: \$(DLLDIR)/$dir/$testname\$(DLLEXT) - cp \$(DLLDIR)/$dir/$testname\$(DLLEXT) \$@ && \$(STRIP) \$@" + +$testname.exe: \$(DLLDIR)/$dir/$testname.exe\$(DLLEXT) + cp \$(DLLDIR)/$dir/$testname.exe\$(DLLEXT) \$@ && \$(STRIP) \$@ +$testname.rc: + echo \"$testname.exe TESTRES \\\"$testname.exe\\\"\" >\$@ || (\$(RM) \$@ && false) +$testname.res: $testname.rc $testname.exe" fi done diff --git a/configure.ac b/configure.ac index c6843d9..23cf7fe 100644 --- a/configure.ac +++ b/configure.ac @@ -2527,10 +2527,14 @@ for dir in $ALL_TEST_DIRS do if test "$dir" != "\\" then - testname=`expr $dir : '$.*$/tests'`_test.exe + testname=`expr $dir : '$.*$/tests'`_test ALL_WINETEST_DEPENDS="$ALL_WINETEST_DEPENDS -$testname: \$(DLLDIR)/$dir/$testname\$(DLLEXT) - cp \$(DLLDIR)/$dir/$testname\$(DLLEXT) \$@ && \$(STRIP) \$@" + +$testname.exe: \$(DLLDIR)/$dir/$testname.exe\$(DLLEXT) + cp \$(DLLDIR)/$dir/$testname.exe\$(DLLEXT) \$@ && \$(STRIP) \$@ +$testname.rc: + echo \"$testname.exe TESTRES \\\"$testname.exe\\\"\" >\$@ || (\$(RM) \$@ && false) +$testname.res: $testname.rc $testname.exe" fi done diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index bd1251f..90cd983 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -20,25 +20,18 @@ RC_SRCS = \ SVG_SRCS = winetest.svg -(a)MAKE_PROG_RULES@ - ALL_TEST_DIRS = @ALL_TEST_DIRS@ -TESTBINS = $(ALL_TEST_DIRS:%/tests=%_test.exe) - -(a)ALL_WINETEST_DEPENDS@ - -# Special rules +TESTBINS = $(ALL_TEST_DIRS:%/tests=%_test.exe) +TESTRCS = $(TESTBINS:.exe=.rc) +EXTRA_OBJS = $(TESTRCS:.rc=.res) -winetest.res: $(TESTBINS) +(a)MAKE_PROG_RULES@ -tests.rc: Makefile.in $(TOPOBJDIR)/config.status - (for i in $(TESTBINS); do echo "$$i TESTRES \"$$i\""; done) >$@ || ($(RM) $@ && false) +(a)ALL_WINETEST_DEPENDS@ clean:: - $(RM) tests.rc dist.res winetest-dist.exe $(TESTBINS) - -depend: tests.rc + $(RM) winetest-dist.exe $(TESTBINS) $(TESTRCS) # Rules for building distributable executable @@ -53,5 +46,3 @@ winetest-dist.exe winetest-dist.exe.so: $(OBJS) dist.res Makefile.in dist.res: build.nfo @DEPENDENCIES@ # everything below this line is overwritten by make depend - -winetest.res: tests.rc diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 4d406f2..8056a25 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -82,5 +82,3 @@ END /* @makedep: winetest.ico */ IDI_WINE ICON "winetest.ico" - -#include "tests.rc" diff --git a/tools/make_makefiles b/tools/make_makefiles index 99a120c..b1766a7 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -74,8 +74,8 @@ my @ignores = ( "dlls/*/tests/testlist.c", "include/config.h", "include/stamp-h", - "programs/winetest/tests.rc", "programs/winetest/*_test.exe", + "programs/winetest/*_test.rc", ); # Source files and their resulting target to ignore

1 0

Alexandre Julliard : loader: Get rid of the pthread support routines.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 4fda657a0a47ea0521b2d8453ecb4a8a6cbd7a94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fda657a0a47ea0521b2d8453… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 4 11:20:39 2009 +0200 loader: Get rid of the pthread support routines. --- loader/Makefile.in | 13 +-- loader/main.c | 1 - loader/main.h | 6 -- loader/pthread.c | 241 ---------------------------------------------------- 4 files changed, 5 insertions(+), 256 deletions(-) diff --git a/loader/Makefile.in b/loader/Makefile.in index afe3f73..0ce816a 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -6,10 +6,7 @@ MODULE = wine C_SRCS = \ main.c \ - preloader.c \ - pthread.c - -MAIN_OBJS = pthread.o main.o + preloader.c EXTRA_BINARIES = @EXTRA_BINARIES@ @@ -39,11 +36,11 @@ LDEXECFLAGS = @LDEXECFLAGS@ wine-preloader: preloader.o Makefile.in $(CC) -o $@ -static -nostartfiles -nodefaultlibs -Wl,-Ttext=0x7c000000 preloader.o $(LIBPORT) $(LDFLAGS) -wine: $(MAIN_OBJS) Makefile.in - $(CC) -o $@ $(LDEXECFLAGS) $(MAIN_OBJS) $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_LOCAL) +wine: main.o Makefile.in + $(CC) -o $@ $(LDEXECFLAGS) main.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_LOCAL) -wine-installed: $(MAIN_OBJS) Makefile.in - $(CC) -o $@ $(LDEXECFLAGS) $(MAIN_OBJS) $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_INSTALL) +wine-installed: main.o Makefile.in + $(CC) -o $@ $(LDEXECFLAGS) main.o $(LIBWINE) $(LIBPORT) $(LIBPTHREAD) $(EXTRALIBS) $(LDFLAGS) $(LDRPATH_INSTALL) $(EXTRA_BINARIES:%=__install__%): $(EXTRA_BINARIES) $(DESTDIR)$(bindir) dummy f=`expr $@ : '__install__$.*$'` && $(INSTALL_PROGRAM) $$f $(DESTDIR)$(bindir)/$$f diff --git a/loader/main.c b/loader/main.c index e0588d1..6de500e 100644 --- a/loader/main.c +++ b/loader/main.c @@ -215,7 +215,6 @@ int main( int argc, char *argv[] ) reserve_area( wine_main_preload_info[i].addr, wine_main_preload_info[i].size ); } - init_pthread_functions(); wine_init( argc, argv, error, sizeof(error) ); fprintf( stderr, "wine: failed to initialize: %s\n", error ); exit(1); diff --git a/loader/main.h b/loader/main.h index b06423f..7d4d4dc 100644 --- a/loader/main.h +++ b/loader/main.h @@ -28,10 +28,4 @@ struct wine_preload_info size_t size; }; -#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3))) -extern void init_pthread_functions(void) __attribute__((visibility ("hidden"))); -#else -extern void init_pthread_functions(void); -#endif - #endif /* __WINE_LOADER_MAIN_H */ diff --git a/loader/pthread.c b/loader/pthread.c deleted file mode 100644 index 712bd37..0000000 --- a/loader/pthread.c +++ /dev/null @@ -1,241 +0,0 @@ -/* - * Wine threading routines using the pthread library - * - * Copyright 2003 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include "config.h" -#include "wine/port.h" - -#include <assert.h> -#include <stdlib.h> -#include <signal.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif -#include <string.h> -#include <sys/types.h> -#ifdef HAVE_SYS_MMAN_H -#include <sys/mman.h> -#endif -#ifdef HAVE_MACH_MACH_H -#include <mach/mach.h> -#endif -#ifdef HAVE_SYS_THR_H -#include <sys/ucontext.h> -#include <sys/thr.h> -#endif -#include <pthread.h> -#ifdef HAVE_PTHREAD_NP_H -#include <pthread_np.h> -#endif - -#include "wine/library.h" -#include "wine/pthread.h" - -static int init_done; -static int nb_threads = 1; - -#if !defined(__i386__) && !defined(__x86_64__) -static pthread_key_t teb_key; -#endif - -#if defined(__x86_64__) && defined(__linux__) -#include <asm/prctl.h> -extern int arch_prctl(int func, void *ptr); -#endif - -/*********************************************************************** - * init_process - * - * Initialization for a newly created process. - */ -static void init_process( const struct wine_pthread_callbacks *callbacks, size_t size ) -{ - init_done = 1; -} - - -/*********************************************************************** - * init_thread - * - * Initialization for a newly created thread. - */ -static void init_thread( struct wine_pthread_thread_info *info ) -{ - /* retrieve the stack info (except for main thread) */ - if (init_done) - { -#ifdef HAVE_PTHREAD_GETATTR_NP - pthread_attr_t attr; - pthread_getattr_np( pthread_self(), &attr ); - pthread_attr_getstack( &attr, &info->stack_base, &info->stack_size ); - pthread_attr_destroy( &attr ); -#elif defined(HAVE_PTHREAD_ATTR_GET_NP) - pthread_attr_t attr; - pthread_attr_init( &attr ); - pthread_attr_get_np( pthread_self(), &attr ); - pthread_attr_getstack( &attr, &info->stack_base, &info->stack_size ); - pthread_attr_destroy( &attr ); -#elif defined(HAVE_PTHREAD_GET_STACKSIZE_NP) && defined(HAVE_PTHREAD_GET_STACKADDR_NP) - char dummy; - info->stack_size = pthread_get_stacksize_np(pthread_self()); - info->stack_base = pthread_get_stackaddr_np(pthread_self()); - /* if base is too large assume it's the top of the stack instead */ - if ((char *)info->stack_base > &dummy) - info->stack_base = (char *)info->stack_base - info->stack_size; -#else - /* assume that the stack allocation is page aligned */ - char dummy; - size_t page_size = getpagesize(); - char *stack_top = (char *)((unsigned long)&dummy & ~(page_size - 1)) + page_size; - info->stack_base = stack_top - info->stack_size; -#endif - } -} - - -/*********************************************************************** - * create_thread - */ -static int create_thread( struct wine_pthread_thread_info *info ) -{ - pthread_t id; - pthread_attr_t attr; - int ret = 0; - - pthread_attr_init( &attr ); - pthread_attr_setstacksize( &attr, info->stack_size ); - pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED ); - pthread_attr_setscope( &attr, PTHREAD_SCOPE_SYSTEM ); /* force creating a kernel thread on Solaris */ - interlocked_xchg_add( &nb_threads, 1 ); - if (pthread_create( &id, &attr, (void * (*)(void *))info->entry, info )) - { - interlocked_xchg_add( &nb_threads, -1 ); - ret = -1; - } - pthread_attr_destroy( &attr ); - return ret; -} - - -/*********************************************************************** - * init_current_teb - * - * Set the current TEB for a new thread. - */ -static void init_current_teb( struct wine_pthread_thread_info *info ) -{ -#ifdef __i386__ - /* On the i386, the current thread is in the %fs register */ - LDT_ENTRY fs_entry; - - wine_ldt_set_base( &fs_entry, info->teb_base ); - wine_ldt_set_limit( &fs_entry, info->teb_size - 1 ); - wine_ldt_set_flags( &fs_entry, WINE_LDT_FLAGS_DATA|WINE_LDT_FLAGS_32BIT ); - wine_ldt_init_fs( info->teb_sel, &fs_entry ); -#elif defined(__x86_64__) - /* On x86_64, it's in %gs */ -# ifdef __linux__ - arch_prctl(ARCH_SET_GS, info->teb_base); -# else -# error Please define setting %gs for your architecture -# endif -#else - if (!init_done) /* first thread */ - pthread_key_create( &teb_key, NULL ); - pthread_setspecific( teb_key, info->teb_base ); -#endif - - /* set pid and tid */ - info->pid = getpid(); -#ifdef __sun - info->tid = pthread_self(); /* this should return the lwp id on solaris */ -#elif defined(__APPLE__) - info->tid = mach_thread_self(); -#elif defined(__FreeBSD__) - { - long lwpid; - thr_self( &lwpid ); - info->tid = (int) lwpid; - } -#else - info->tid = gettid(); -#endif -} - - -/*********************************************************************** - * get_current_teb - */ -static void *get_current_teb(void) -{ -#ifdef __i386__ - void *ret; - __asm__( ".byte 0x64\n\tmovl 0x18,%0" : "=r" (ret) ); - return ret; -#elif defined(__x86_64__) - void *ret; - __asm__( ".byte 0x65\n\tmovq 0x30,%0" : "=r" (ret) ); - return ret; -#else - return pthread_getspecific( teb_key ); -#endif -} - - -/*********************************************************************** - * exit_thread - */ -static void DECLSPEC_NORETURN exit_thread( struct wine_pthread_thread_info *info ) -{ - if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) exit( info->exit_status ); - wine_ldt_free_fs( info->teb_sel ); - if (info->teb_size) munmap( info->teb_base, info->teb_size ); - pthread_exit( (void *)info->exit_status ); -} - - -/*********************************************************************** - * abort_thread - */ -static void DECLSPEC_NORETURN abort_thread( long status ) -{ - if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status ); - pthread_exit( (void *)status ); -} - - -/*********************************************************************** - * pthread_functions - */ -static const struct wine_pthread_functions pthread_functions = -{ - init_process, - init_thread, - create_thread, - init_current_teb, - get_current_teb, - exit_thread, - abort_thread, - pthread_sigmask -}; - -void init_pthread_functions(void) -{ - wine_pthread_set_functions( &pthread_functions, sizeof(pthread_functions) ); -}

1 0

Alexandre Julliard : include: Get rid of the no longer used wine/pthread.h.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: 1d5cb9d23b71851ba069bdbb91f1d74187b3c7f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d5cb9d23b71851ba069bdbb9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Jul 4 11:36:44 2009 +0200 include: Get rid of the no longer used wine/pthread.h. --- include/wine/pthread.h | 67 ------------------------------------------------ libs/wine/port.c | 5 ++- 2 files changed, 3 insertions(+), 69 deletions(-) diff --git a/include/wine/pthread.h b/include/wine/pthread.h deleted file mode 100644 index 561c22c..0000000 --- a/include/wine/pthread.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Definitions for Wine pthread emulation - * - * Copyright 2003 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __WINE_WINE_PTHREAD_H -#define __WINE_WINE_PTHREAD_H - -struct wine_pthread_callbacks; - -#include <signal.h> - -#ifndef HAVE_SIGSET_T -struct sigset_t; -typedef struct sigset_t sigset_t; -#endif - -/* thread information used to creating and exiting threads */ -struct wine_pthread_thread_info -{ - void *stack_base; /* base address of the stack */ - size_t stack_size; /* size of the stack */ - void *teb_base; /* base address of the TEB */ - size_t teb_size; /* size of the TEB (possibly including signal stack) */ - unsigned short teb_sel; /* selector to use for TEB */ - int pid; /* Unix process id */ - int tid; /* Unix thread id */ - void (*entry)( struct wine_pthread_thread_info *info ); /* thread entry point */ - long exit_status; /* thread exit status when calling wine_pthread_exit_thread */ -}; - -struct wine_pthread_functions -{ - void (*init_process)( const struct wine_pthread_callbacks *callbacks, size_t size ); - void (*init_thread)( struct wine_pthread_thread_info *info ); - int (*create_thread)( struct wine_pthread_thread_info *info ); - void (*init_current_teb)( struct wine_pthread_thread_info *info ); - void * (*get_current_teb)(void); -#ifdef __GNUC__ - void (* __attribute__((noreturn)) exit_thread)( struct wine_pthread_thread_info *info ); - void (* __attribute__((noreturn)) abort_thread)( long status ); -#else - void (*exit_thread)( struct wine_pthread_thread_info *info ); - void (*abort_thread)( long status ); -#endif - int (*sigprocmask)( int how, const sigset_t *newset, sigset_t *oldset ); -}; - -extern void wine_pthread_get_functions( struct wine_pthread_functions *functions, size_t size ); -extern void wine_pthread_set_functions( const struct wine_pthread_functions *functions, size_t size ); - -#endif /* __WINE_WINE_PTHREAD_H */ diff --git a/libs/wine/port.c b/libs/wine/port.c index cfd3bcd..1e05e2b 100644 --- a/libs/wine/port.c +++ b/libs/wine/port.c @@ -26,9 +26,10 @@ #include <sys/types.h> #include "wine/library.h" -#include "wine/pthread.h" -static struct wine_pthread_functions pthread_functions; +/* no longer used, for backwards compatibility only */ +struct wine_pthread_functions; +static void *pthread_functions[8]; /*********************************************************************** * wine_pthread_get_functions

1 0

David Adam : d3dx9_36: Fix tests to make them pass in Windows.
by Alexandre Julliard 06 Jul '09

06 Jul '09

Module: wine Branch: master Commit: db412878444145f17bf17adad4b3251ac8e39223 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db412878444145f17bf17adad… Author: David Adam <david.adam.cnrs(a)gmail.com> Date: Fri Jul 3 16:14:54 2009 +0200 d3dx9_36: Fix tests to make them pass in Windows. --- dlls/d3dx9_36/tests/texture.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c index c2f47f2..7f10e2d 100644 --- a/dlls/d3dx9_36/tests/texture.c +++ b/dlls/d3dx9_36/tests/texture.c @@ -62,15 +62,20 @@ static const unsigned char noimage[4] = { static HRESULT create_file(const char *filename, const unsigned char *data, const unsigned int size) { + DWORD received; HANDLE hfile; - hfile = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + hfile = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); if(hfile == INVALID_HANDLE_VALUE) return HRESULT_FROM_WIN32(GetLastError()); - WriteFile(hfile, data, size, NULL, NULL); - CloseHandle(hfile); + if(WriteFile(hfile, data, size, &received, NULL)) + { + CloseHandle(hfile); + return D3D_OK; + } - return D3D_OK; + CloseHandle(hfile); + return D3DERR_INVALIDCALL; } static void test_D3DXGetImageInfo()

1 0

Łukasz Wojniłowicz : Polish translation for release 1.1.25
by Jeremy Newman 06 Jul '09

06 Jul '09

Module: website Branch: master Commit: 094977b2cb18b7b0a0087001c32639164c0986bc URL: http://source.winehq.org/git/website.git/?a=commit;h=094977b2cb18b7b0a00870… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Fri Jul 3 19:36:40 2009 +0200 Polish translation for release 1.1.25 --- news/pl/2009070301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/pl/2009070301.xml b/news/pl/2009070301.xml new file mode 100644 index 0000000..e81a1bb --- /dev/null +++ b/news/pl/2009070301.xml @@ -0,0 +1,17 @@ +<news> +<date>Lipiec 3, 2009</date> +<title>Wydano Wine 1.1.25</title> +<body> + Wydanie rozwojowe Wine 1.1.25 jest już dostępne. + <a href="{$root}/announce/1.1.25">Co nowego</a> w tym wydaniu: +<ul> + <li>Masa aktualizacji plików językowych.</li> + <li>Wsparcie dla rozmaitych kodowań Unicode w Notatniku.</li> + <li>Ulepszone zarządzanie pamięcią, w szczególności dla OpenGL.</li> + <li>Menu pulpitu są teraz oczyszczane automatycznie.</li> + <li>Początek implementacji bliblioteki DLL windowscodecs.</li> + <li>Rozmaite poprawki błędów.</li> +</ul> +Źródło jest <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.25.tar.bz2">już dostępne</a>. +Paczki binarne są w trakcie budowy i ukażą się wkróce w przeznaczonych dla nich <a href="{$root}/download">pobieralniach</a>. +</body></news>

1 0

Alexander Nicolaysen Sørnes : category: Order cat list on add/edit form
by Alexander Nicolaysen Sørnes 04 Jul '09

04 Jul '09

Module: appdb Branch: master Commit: 8060eab22a49167dd290db0037df262eae56b192 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8060eab22a49167dd290db00… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Thu Jul 2 23:27:50 2009 +0200 category: Order cat list on add/edit form --- include/category.php | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/include/category.php b/include/category.php index c0c6bc1..dc51bd4 100644 --- a/include/category.php +++ b/include/category.php @@ -160,11 +160,20 @@ class Category { } /* Get all category objects, ordered and with category names indented - according to subcategory level */ - static function getOrderedList() + according to subcategory level. + Optionally includes the 'Main' top category. */ + static function getOrderedList($bIncludeMain = false) { $oCat = new category(); - return $oCat->getSubCatList(0); + + if(!$bIncludeMain) + return $oCat->getSubCatList(0); + + $oCat->sName = 'Main'; + $aCats = array($oCat); + $aCats += $oCat->getSubCatList(1); + + return $aCats; } function objectGetMail($sAction, $bMailSubmitter, $bParentAction) @@ -278,18 +287,14 @@ class Category { function outputEditor() { - $sQuery = "SELECT catId, catName FROM appCategory WHERE catId!='?'"; - $hResult = query_parameters($sQuery, $this->iCatId); - - /* Add the virtual 'Main' category */ - $aCatIds = array(0); - $aCatNames = array('Main'); + $aCategories = category::getOrderedList(true); + $aCatNames = array(); + $aCatIds = array(); - /* Add the rest from the database */ - while($oRow = query_fetch_object($hResult)) + foreach($aCategories as $oCategory) { - $aCatIds[] = $oRow->catId; - $aCatNames[] = $oRow->catName; + $aCatNames[] = $oCategory->sName; + $aCatIds[] = $oCategory->objectGetId(); } echo "<table border=\"0\" width=\"100%\" cellspacing=\"0\" cellpadding=\"2\">

1 0

Alexander Nicolaysen Sørnes : application: Order cat list on edit app page
by Alexander Nicolaysen Sørnes 04 Jul '09

04 Jul '09

Module: appdb Branch: master Commit: 82999b22c7e5fd56d73000cc1f836bee720994ee URL: http://source.winehq.org/git/appdb.git/?a=commit;h=82999b22c7e5fd56d73000cc… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Fri Jul 3 00:17:59 2009 +0200 application: Order cat list on edit app page --- include/application.php | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/include/application.php b/include/application.php index 137580c..c5ef52b 100644 --- a/include/application.php +++ b/include/application.php @@ -565,9 +565,20 @@ class Application { echo '<td><input size="20" type="text" name="sAppName" value="'.$this->sName.'"></td></tr>',"\n"; // app Category - $w = new TableVE("view"); echo '<tr valign=top><td class="color0">Category</td><td>',"\n"; - echo $w->make_option_list("iAppCatId", $this->iCatId,"appCategory","catId","catName"); + + $aCategories = category::getOrderedList(true); + $aCatNames = array(); + $aCatIds = array(); + + foreach($aCategories as $oCategory) + { + $aCatNames[] = $oCategory->sName; + $aCatIds[] = $oCategory->objectGetId(); + } + + echo html_select("iAppCatId",$aCatIds,$this->iCatId, $aCatNames); + echo '</td></tr>',"\n"; $oVendor = new vendor($this->iVendorId);

1 0

Maik Schulz : website: German translation for release 1.1.25 news item
by Maik Schulz 03 Jul '09

03 Jul '09

Module: website Branch: master Commit: 808f79629b7bb14c6ffc6a5a09340134f6ba8dab URL: http://source.winehq.org/git/website.git/?a=commit;h=808f79629b7bb14c6ffc6a… Author: Maik Schulz <maik.schulz(a)gmail.com> Date: Fri Jul 3 23:39:40 2009 +0200 website: German translation for release 1.1.25 news item --- news/de/2009070301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2009070301.xml b/news/de/2009070301.xml new file mode 100644 index 0000000..cb84246 --- /dev/null +++ b/news/de/2009070301.xml @@ -0,0 +1,17 @@ +<news> +<date>3. Juli 2009</date> +<title>Wine 1.1.25 Freigegeben</title> +<body> + Die Entwicklungsversion 1.1.25 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.1.25">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Sehr viele neue Übersetzungen.</li> + <li>Unterstützung für diverse Unicode-Varianten in Notepad.</li> + <li>Verbessertes Speicher-Management, insbesondere für OpenGL.</li> + <li>Desktop Menüs werden jetzt automatisch aufgeräumt.</li> + <li>Anfang einer Implementierung einer windowscodecs DLL.</li> + <li>Verschiedenste Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.25.tar.bz2">verfügbar</a>. +Binär-Downloads werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Download-Seiten</a> zur Verfügung. +</body></news>

1 0

Alexandre Julliard : Wine release 1.1.25
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: website Branch: master Commit: a4054d6507c2ced72858acdd2dbde3a0b7c5522c URL: http://source.winehq.org/git/website.git/?a=commit;h=a4054d6507c2ced72858ac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 18:35:11 2009 +0200 Wine release 1.1.25 --- news/en/2009070301.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/en/2009070301.xml b/news/en/2009070301.xml new file mode 100644 index 0000000..d68e3ba --- /dev/null +++ b/news/en/2009070301.xml @@ -0,0 +1,17 @@ +<news> +<date>July 3, 2009</date> +<title>Wine 1.1.25 Released</title> +<body> + The Wine development release 1.1.25 is now available. + <a href="{$root}/announce/1.1.25">What's new</a> in this release: +<ul> + <li>A ton of translation updates.</li> + <li>Support for various Unicode file encodings in Notepad.</li> + <li>Improved memory management, especially for OpenGL.</li> + <li>Desktop menus now cleaned up automatically.</li> + <li>Beginnings of a windowscodecs DLL implementation.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.25.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 1.1.25.
by Alexandre Julliard 03 Jul '09

03 Jul '09

Module: wine Branch: master Commit: a6beb5066884a4fdb7270d84c012ba8ef8a64342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6beb5066884a4fdb7270d84c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 3 18:28:33 2009 +0200 Release 1.1.25. --- ANNOUNCE | 1294 ++++++++++++++++++++++++++++++++++++------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 777 insertions(+), 537 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6beb5066884a4fdb7270…

1 0