Module: wine
Branch: master
Commit: fd3a1bb009b2b197e9cf48d213e9e561fe59e7cc
URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd3a1bb009b2b197e9cf48d21…
Author: José Manuel Ferrer Ortiz <jmfo1982(a)yahoo.es>
Date: Mon Jun 15 20:47:10 2009 +0000
winecfg: Spanish resources update.
---
programs/winecfg/Es.rc | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc
index 86639f7..3deedc3 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -2,7 +2,7 @@
* WineCfg resources
* Spanish Language Support
*
- * Copyright 2003-2008 Jos� Manuel Ferrer Ortiz
+ * Copyright 2003-2009 Jos� Manuel Ferrer Ortiz
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -52,9 +52,9 @@ FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX " Configuraci�n de aplicaciones ",IDC_STATIC, 8,4,244,240
LTEXT "Wine puede imitar distintas versiones de Windows para cada aplicaci�n. Esta pesta�a est� enlazada a las de Librer�as y Gr�ficos para poder cambiar en ellas la configuraci�n global y/o la de por aplicaci�n.",
- IDC_STATIC,15,20,227,32
+ IDC_STATIC,15,16,227,32
CONTROL "Aplicaciones",IDC_APP_LISTVIEW,"SysListView32",WS_BORDER | WS_TABSTOP | LVS_LIST | LVS_SINGLESEL | LVS_SHOWSELALWAYS,
- 15,56,230,144
+ 15,50,230,150
PUSHBUTTON "&A�adir aplicaci�n...",IDC_APP_ADDAPP, 90,204,75,14
PUSHBUTTON "&Eliminar aplicaci�n...",IDC_APP_REMOVEAPP, 170,204,75,14
LTEXT "&Versi�n a imitar:",IDC_STATIC,17,226,58,16
@@ -67,7 +67,7 @@ FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX " Configuraci�n de ventanas ",IDC_STATIC,8,4,244,84
CONTROL "Permitir a los programas DirectX retener el rat�n en sus ventanas",IDC_DX_MOUSE_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8
- CONTROL "Allow the window manager to &decorate the windows",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8
+ CONTROL "Permitir al gestor de ventanas decorar las ventanas",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8
CONTROL "Permitir al gestor de ventanas controlar las ventanas",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8
CONTROL "Emular un escritorio virtual",IDC_ENABLE_DESKTOP,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8
@@ -81,11 +81,11 @@ BEGIN
COMBOBOX IDC_D3D_VSHADER_MODE,100,108,145,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
CONTROL "Permitir Pixel Shader (si hay soporte por hardware)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10
- GROUPBOX " Screen &Resolution ",IDC_STATIC,8,151,244,93
+ GROUPBOX " Resoluci�n de pantalla ",IDC_STATIC,8,151,244,93
CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,187,15
EDITTEXT IDC_RES_DPIEDIT,204,161,23,13,ES_NUMBER|WS_TABSTOP
- LTEXT "dpi",IDC_STATIC,235,163,10,8
- LTEXT "This is a sample text using 10 point Tahoma",IDC_RES_FONT_PREVIEW,15,181,230,55
+ LTEXT "ppp",IDC_STATIC,235,163,10,8
+ LTEXT "Esto es un texto de ejemplo usando Tahoma de 10 puntos",IDC_RES_FONT_PREVIEW,15,181,230,55
END
IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250
@@ -124,12 +124,12 @@ STYLE WS_CHILD | WS_DISABLED
FONT 8, "MS Shell Dlg"
BEGIN
GROUPBOX " Mapeos de unidad ",IDC_STATIC,8,4,244,240
- LTEXT "Failed to connect to the mount manager, the drive configuration cannot be edited.", IDC_STATIC_MOUNTMGR_ERROR, 15,30,220,76
+ LTEXT "Conexi�n fallida al gestor de montaje, la configuraci�n de unidades no se puede editar.", IDC_STATIC_MOUNTMGR_ERROR, 15,30,220,76
CONTROL "Listview",IDC_LIST_DRIVES,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT |
LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,18,232,76
PUSHBUTTON "&A�adir...",IDC_BUTTON_ADD,15,98,37,14
PUSHBUTTON "&Eliminar",IDC_BUTTON_REMOVE,56,98,37,14
- PUSHBUTTON "Auto&detectar...",IDC_BUTTON_AUTODETECT,197,98,49,14
+ PUSHBUTTON "Auto&detectar...",IDC_BUTTON_AUTODETECT,187,98,59,14
/* editing drive details */
LTEXT "&Ruta:",IDC_STATIC_PATH,15,123,20,9
@@ -316,7 +316,7 @@ BEGIN
IDC_SYSPARAMS_BUTTON_DARK_SHADOW "Sombra oscura del control"
IDC_SYSPARAMS_BUTTON_LIGHT "Parte iluminada del control"
IDC_SYSPARAMS_BUTTON_ALTERNATE "Fondo alternativo del control"
- IDC_SYSPARAMS_HOT_TRACKING "Elemento Hot Tracked"
+ IDC_SYSPARAMS_HOT_TRACKING "Elemento resaltado"
IDC_SYSPARAMS_ACTIVE_TITLE_GRADIENT "Gradiente barra t�tulo activa"
IDC_SYSPARAMS_INACTIVE_TITLE_GRADIENT "Gradiente barra t�tulo inactiva"
IDC_SYSPARAMS_MENU_HILIGHT "Resaltado del men�"
Module: wine
Branch: master
Commit: 748e34329f525a398eb3199d9030ab2c539658b3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=748e34329f525a398eb3199d9…
Author: André Hentschel <nerv(a)dawncrow.de>
Date: Mon Jun 15 19:26:02 2009 +0200
documentation: Keep README.de in sync.
---
documentation/README.de | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/documentation/README.de b/documentation/README.de
index ee07af0..332ab88 100644
--- a/documentation/README.de
+++ b/documentation/README.de
@@ -64,6 +64,9 @@ NetBSD-Info:
Stellen Sie sicher, dass Sie die Optionen USER_LDT, SYSVSHM, SYSVSEM und
SYSVMSG in Ihrem Kernel aktiviert haben.
+Mac OS X Info:
+ Sie ben�tigen mindestens Xcode 2.4 um richtig unter x86 kompilieren zu k�nnen.
+
Unterst�tzte Dateisysteme:
Wine sollte auf den meisten Dateisystemen laufen. Jedoch wird Wine nicht
starten, wenn umsdos f�r das Verzeichnis /tmp benutzt wird. Ein paar
@@ -86,6 +89,9 @@ Optionale Support-Bibliotheken:
die von Wine benutzt werden k�nnen, aber auf dem System nicht vorhanden
sind.
+ Auf 64-Bit Plattformen ben�tigen Sie die 32-bit
+ Versionen dieser Bibliotheken; siehe dazu http://wiki.winehq.org/WineOn64bit
+
4. KOMPILIEREN
Wenn Sie sich daf�r entscheiden, wineinstall nicht zu benutzen, f�hren Sie
@@ -109,10 +115,10 @@ wechsen Sie erst mit cd in das Wurzelverzeichnis dieses Releases (das,
welches diese README-Datei enth�lt). Geben Sie dann "make clean" ein
und patchen Sie das Release mit dem Kommando:
- gunzip -c patch-file | patch -p1
+ bunzip2 -c Patch-Datei | patch -p1
-wobei "patch-file" der Name der Patch-Datei ist (etwas wie
-Wine-yymmdd.diff.gz). Sie k�nnen dann erneut "./configure" und danach
+wobei "Patch-Datei" der Name der Patch-Datei ist (sowas wie
+wine-1.0.x.diff.bz2). Sie k�nnen dann erneut "./configure" und danach
"make depend && make" aufrufen.
5. SETUP
@@ -137,16 +143,16 @@ und f
Wenn Sie Wine aufrufen, k�nnen Sie den vollst�ndigen Pfad zur ausf�hrbaren
Datei angeben oder nur einen Dateinamen.
-Beispiel: Um Solitaire auszuf�hren:
+Beispiel: Um Notepad auszuf�hren:
- wine sol (den Suchpfad, der in der Konfiguartions-Datei
- wine sol.exe angegeben wurde, benutzend)
+ wine notepad (den Suchpfad, der in der Konfiguartions-Datei
+ wine notepad.exe angegeben wurde, benutzend)
- wine c:\\windows\\sol.exe (die Dateinamen-Syntax von DOS benutzend)
+ wine c:\\windows\\notepad.exe (die Dateinamen-Syntax von DOS benutzend)
- wine /usr/windows/sol.exe (die Dateinamen-Syntax von Unix benutzend)
+ wine ~/.wine/drive_c/windows/notepad.exe (die Dateinamen-Syntax von Unix benutzend)
- wine sol.exe /parameter1 -parameter2 parameter3
+ wine notepad.exe /parameter1 -parameter2 parameter3
(Programmaufruf mit Parametern)
Hinweis: Der Pfad zur Datei wird auch zum Pfad hinzugef�gt, wenn ein vollst�ndiger
@@ -188,13 +194,15 @@ Fehler: Melden Sie Fehler bitte an Wine-Bugzilla unter http://bugs.winehq.org
IRC: Online-Hilfe wird Ihnen im Chat-Kanal #WineHQ unter irc.freenode.net gew�hrt.
-CVS: Der aktuelle Wine-Entwicklungs-Tree ist �ber CVS verf�gbar.
- Besuchen Sie http://www.winehq.org/cvs f�r weitere Informationen.
+GIT: Der aktuelle Wine-Entwicklungs-Zweig ist �ber GIT verf�gbar.
+ Besuchen Sie http://www.winehq.org/site/git f�r weitere Informationen.
Mailing-Listen:
Es gibt mehrere Mailing-Listen f�r die Wine-Entwickler; Schauen Sie
sich bitte dazu http://www.winehq.org/forums an.
+Wiki: Das Wine-Wiki finden Sie unter http://wiki.winehq.org
+
Wenn Sie etwas hinzuf�gen oder einen Fehler beheben, senden Sie den Patch bitte
(im 'diff -u'-Format) an die Liste wine-patches(a)winehq.org, um ihn in die n�chste
Ausgabe aufnehmen zu k�nnen.
Module: appdb
Branch: master
Commit: 70729a700c63a41da2ae3520a68dbe136b2fdb2b
URL: http://source.winehq.org/git/appdb.git/?a=commit;h=70729a700c63a41da2ae3520…
Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com>
Date: Mon Jun 15 15:18:39 2009 +0200
Merge some code to get list of Wine versions
---
include/util.php | 19 +++++--------------
1 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/include/util.php b/include/util.php
index acdac5a..5d9cb8b 100644
--- a/include/util.php
+++ b/include/util.php
@@ -165,8 +165,10 @@ function get_xml_tag ($file, $mode = null)
/* bugzilla functions */
// Returns an array containg the Wine versions stored in our Bugzilla DB
-function get_bugzilla_versions()
+// If bReturnIds is true, version ids are returned instead of names
+function get_bugzilla_versions($bReturnIds = false)
{
+ $sFetchColumn = $bReturnIds ? 'id' : 'value';
$aVersions = array();
$sTable = BUGZILLA_DB.".versions";
@@ -180,7 +182,7 @@ function get_bugzilla_versions()
foreach($aBranches as $sBranch)
{
$sWhere = "WHERE product_id =".BUGZILLA_PRODUCT_ID." AND value LIKE '$sBranch%'";
- $sQuery = "SELECT value FROM $sTable $sWhere ORDER BY id desc limit 6";
+ $sQuery = "SELECT $sFetchColumn FROM $sTable $sWhere ORDER BY id desc limit 6";
$hResult = query_bugzilladb($sQuery);
if($hResult)
{
@@ -198,18 +200,7 @@ function get_bugzilla_versions()
// Returns an array containing the IDs of the Wine versions stored in Bugzilla
function get_bugzilla_version_ids()
{
- $aIds = array();
- $hResult = query_bugzilladb("SELECT id FROM ".BUGZILLA_DB.".versions WHERE
- product_id = '".BUGZILLA_PRODUCT_ID."'
- ORDER BY id DESC LIMIT 6");
-
- if(!$hResult)
- return $aIds;
-
- while(list($sId) = mysql_fetch_row($hResult))
- $aIds[] = $sId;
-
- return $aIds;
+ return get_bugzilla_versions(true);
}
// $sVarname - name of the selection array that this function will output
Module: appdb
Branch: master
Commit: b62ed3aab6304d45048cda257aa4ea0502266bb6
URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b62ed3aab6304d45048cda25…
Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com>
Date: Mon Jun 15 15:17:04 2009 +0200
Fix syntax in config.php.sample
---
include/config.php.sample | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/config.php.sample b/include/config.php.sample
index 6caf756..86f924a 100644
--- a/include/config.php.sample
+++ b/include/config.php.sample
@@ -35,7 +35,7 @@ define("TESTDATA_AGED_THRESHOLD", 175);
// Show versions from these branches even if they are not among the most recent ones
// Separate by commas if there are more than one
-define("STABLE_BRANCHES", "1.0."););
+define("STABLE_BRANCHES", "1.0.");
/*
* apps database info
Module: wine
Branch: master
Commit: afce86b4bc6198575bbe6046d12fd77efe01cd46
URL: http://source.winehq.org/git/wine.git/?a=commit;h=afce86b4bc6198575bbe6046d…
Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk>
Date: Fri Jun 5 18:58:55 2009 +0200
gdi32: Add stub for GdiEntry13.
---
dlls/gdi32/driver.c | 11 +++++++++++
dlls/gdi32/gdi32.spec | 1 +
include/Makefile.in | 1 +
include/ddrawgdi.h | 36 ++++++++++++++++++++++++++++++++++++
4 files changed, 49 insertions(+), 0 deletions(-)
diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c
index 20d3f36..ec5de20 100644
--- a/dlls/gdi32/driver.c
+++ b/dlls/gdi32/driver.c
@@ -28,6 +28,7 @@
#include "windef.h"
#include "winbase.h"
#include "winreg.h"
+#include "ddrawgdi.h"
#include "gdi_private.h"
#include "wine/unicode.h"
@@ -741,3 +742,13 @@ INT WINAPI NamedEscape( HDC hdc, LPCWSTR pDriver, INT nEscape, INT cbInput, LPCS
lpszOutData);
return 0;
}
+
+/*******************************************************************
+ * DdQueryDisplaySettingsUniqueness [GDI32.@]
+ * GdiEntry13 [GDI32.@]
+ */
+ULONG WINAPI DdQueryDisplaySettingsUniqueness(VOID)
+{
+ FIXME("stub\n");
+ return 0;
+}
diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec
index 36a8fb1..6a67f44 100644
--- a/dlls/gdi32/gdi32.spec
+++ b/dlls/gdi32/gdi32.spec
@@ -174,6 +174,7 @@
# @ stub GdiDrawStream
# @ stub GdiEndDocEMF
# @ stub GdiEndPageEMF
+@ stdcall GdiEntry13()
# @ stub GdiFixUpHandle
@ stdcall GdiFlush()
# @ stub GdiFullscreenControl
diff --git a/include/Makefile.in b/include/Makefile.in
index 3d80857..c62b85f 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -176,6 +176,7 @@ SRCDIR_INCLUDES = \
ddk/winddiui.h \
ddk/winsplp.h \
ddraw.h \
+ ddrawgdi.h \
ddrawi.h \
devenum.idl \
devguid.h \
diff --git a/include/ddrawgdi.h b/include/ddrawgdi.h
new file mode 100644
index 0000000..9aea733
--- /dev/null
+++ b/include/ddrawgdi.h
@@ -0,0 +1,36 @@
+/*
+ * Ddrawgdi definitions
+ *
+ * Copyright (C) 2009 Louis Lenders
+ *
+ * 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_DDRAWGDI_H
+#define __WINE_DDRAWGDI_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define DdQueryDisplaySettingsUniqueness GdiEntry13
+
+ULONG APIENTRY DdQueryDisplaySettingsUniqueness(VOID);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __WINE_DDRAWGDI_H */