October 2010 - Wine-Commits

Łukasz Wojniłowicz : ipconfig: Update the Polish translation.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: bbca5259ff7cb552920788405ea007bc64b4c34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbca5259ff7cb552920788405… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Oct 25 18:11:41 2010 +0200 ipconfig: Update the Polish translation. --- programs/ipconfig/Pl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/ipconfig/Pl.rc b/programs/ipconfig/Pl.rc index 25cce09..05a13ff 100644 --- a/programs/ipconfig/Pl.rc +++ b/programs/ipconfig/Pl.rc @@ -43,4 +43,5 @@ STRINGTABLE STRING_DHCP_ENABLED, "DHCP w��czone" STRING_YES, "Tak" STRING_NO, "Nie" + STRING_DEFAULT_GATEWAY, "Brama domy�lna" }

1 0

Łukasz Wojniłowicz : jscript: Update the Polish translation.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 4a9e8137329f264fe7dfb3b9a0a9c1f341b697e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a9e8137329f264fe7dfb3b9a… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Oct 25 18:11:40 2010 +0200 jscript: Update the Polish translation. --- dlls/jscript/jscript_Pl.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_Pl.rc b/dlls/jscript/jscript_Pl.rc index d553c2c..397683e 100644 --- a/dlls/jscript/jscript_Pl.rc +++ b/dlls/jscript/jscript_Pl.rc @@ -25,6 +25,7 @@ STRINGTABLE IDS_TO_PRIMITIVE "B��d przy przekszta�caniu obiektu do typu podstawowego" IDS_INVALID_CALL_ARG "Niew�a�ciwe wywo�anie procedury lub argument" IDS_CREATE_OBJ_ERROR "Serwer automatyzacji nie mo�e stworzy� obiektu" + IDS_SUBSCRIPT_OUT_OF_RANGE "Indeks dolny poza zakresem" IDS_NO_PROPERTY "Obiekt nie wspiera tej w�a�ciwo�ci lub metody" IDS_UNSUPPORTED_ACTION "Obiekt nie wspiera tej akcji" IDS_ARG_NOT_OPT "Argument nieopcjonalny" @@ -40,6 +41,7 @@ STRINGTABLE IDS_ILLEGAL_ASSIGN "Niepoprawne przypisanie" IDS_UNDEFINED "'|' jest niezdefiniowany" IDS_NOT_BOOL "Oczekiwany obiekt boolean" + IDS_NOT_VBARRAY "Oczekiwany obiekt VBArray" IDS_JSCRIPT_EXPECTED "Oczekiwany obiekt JScript" IDS_REGEXP_SYNTAX_ERROR "B��d sk�adni w regularnym wyra�eniu" IDS_URI_INVALID_CHAR "Kodowane URI zawiera niew�a�ciwe znaki"

1 0

Louis Lenders : dwmapi: Add stubbed DwmGetWindowAttribute.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: ca79cf9beae752639899dcf1f34e8dff414c9e06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca79cf9beae752639899dcf1f… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Mon Oct 25 21:04:34 2010 +0200 dwmapi: Add stubbed DwmGetWindowAttribute. --- dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index 33d062f..8e01cac 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -32,7 +32,7 @@ @ stdcall DwmGetGraphicsStreamClient(long ptr) @ stdcall DwmGetGraphicsStreamTransformHint(long ptr) @ stdcall DwmGetTransportAttributes(ptr ptr ptr) -@ stub DwmGetWindowAttribute +@ stdcall DwmGetWindowAttribute(ptr long ptr long) @ stdcall DwmIsCompositionEnabled(ptr) @ stub DwmModifyPreviousDxFrameDuration @ stub DwmQueryThumbnailSourceSize diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index fc0a792..c1bc000 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -188,3 +188,13 @@ BOOL WINAPI DwmDefWindowProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam, return FALSE; } + +/********************************************************************** + * DwmGetWindowAttribute (DWMAPI.@) + */ +HRESULT WINAPI DwmGetWindowAttribute(HWND hwnd, DWORD attribute, PVOID pv_attribute, DWORD size) +{ + FIXME("(%p %d %p %d) stub\n", hwnd, attribute, pv_attribute, size); + + return E_NOTIMPL; +}

1 0

Łukasz Wojniłowicz : taskkill: Add the Polish translation.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 068f3b7cb619aac47452653f809f126aab95ad42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=068f3b7cb619aac47452653f8… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Mon Oct 25 18:11:42 2010 +0200 taskkill: Add the Polish translation. --- programs/taskkill/Makefile.in | 1 + programs/taskkill/Pl.rc | 42 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in index dbb065c..cc310f3 100644 --- a/programs/taskkill/Makefile.in +++ b/programs/taskkill/Makefile.in @@ -13,6 +13,7 @@ RC_SRCS = \ Ko.rc \ Lt.rc \ Nl.rc \ + Pl.rc \ Si.rc \ Sv.rc \ Uk.rc diff --git a/programs/taskkill/Pl.rc b/programs/taskkill/Pl.rc new file mode 100644 index 0000000..4d445e3 --- /dev/null +++ b/programs/taskkill/Pl.rc @@ -0,0 +1,42 @@ +/* + * Task termination utility + * Polish language support + * + * Copyright 2010 �ukasz Wojni�owicz + * + * 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 "taskkill.h" + +LANGUAGE LANG_POLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "U�ycie: taskkill [/?] [/f] [/im nazwa procesu | /pid id procesu]\n" + STRING_INVALID_OPTION, "B��d: Podano nieznany lub nieprawid�owy argument wiersza polece�.\n" + STRING_INVALID_PARAM, "B��d: Podano nieprawid�owy parametr wiersza polece�.\n" + STRING_MISSING_OPTION, "B��d: Jedna z opcji /im albo /pid musi by� podana.\n" + STRING_MISSING_PARAM, "B��d: Argument %s oczekuje parametru wiersza polece�.\n" + STRING_MUTUAL_EXCLUSIVE, "B��d: Argumenty /im i /pid wykluczaj� si� wzajemnie.\n" + STRING_CLOSE_PID_SEARCH, "Polecenie zamykaj�ce zosta�o wys�ane do najwy�szego okna procesu z PID %u.\n" + STRING_CLOSE_PROC_SRCH, "Polecenie zamykaj�ce zosta�o wys�ane do najwy�szego okna procesu \"%s\" z PID %u.\n" + STRING_TERM_PID_SEARCH, "Proces z PID %u zosta� zmuszony do zako�czenia.\n" + STRING_TERM_PROC_SEARCH, "Proces \"%s\" z PID %u zosta� zmuszony do zako�czenia.\n" + STRING_SEARCH_FAILED, "B��d: Nie mo�na znale�� procesu \"%s\".\n" + STRING_ENUM_FAILED, "B��d: Nie mo�na ponumerowa� listy proces�w.\n" + STRING_TERMINATE_FAILED, "B��d: Nie mo�na zako�czy� procesu \"%s\".\n" + STRING_SELF_TERMINATION, "B��d: Samo-zako�czenie procesu nie jest dozwolone.\n" +}

1 0

Rico Schüller : include: Move D3D_SRV_DIMENSION to d3dcommon.h.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 512a47c5763f72ca392ea1736e8e4b237317db4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=512a47c5763f72ca392ea1736… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 25 20:30:38 2010 +0200 include: Move D3D_SRV_DIMENSION to d3dcommon.h. --- .gitignore | 1 + include/Makefile.in | 1 + include/d3d10.idl | 13 +------------ include/d3d10_1.idl | 15 +-------------- include/d3d11.idl | 24 ++++++++++++++++++++++++ include/d3dcommon.idl | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 77 insertions(+), 26 deletions(-) diff --git a/.gitignore b/.gitignore index 581c57b..fdfe55b 100644 --- a/.gitignore +++ b/.gitignore @@ -161,6 +161,7 @@ include/ctfutb.h include/ctxtcall.h include/d3d10.h include/d3d10_1.h +include/d3d11.h include/d3dcommon.h include/ddstream.h include/devicetopology.h diff --git a/include/Makefile.in b/include/Makefile.in index fc84b32..70fa9f0 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -21,6 +21,7 @@ PUBLIC_IDL_H_SRCS = \ ctxtcall.idl \ d3d10.idl \ d3d10_1.idl \ + d3d11.idl \ d3dcommon.idl \ ddstream.idl \ devicetopology.idl \ diff --git a/include/d3d10.idl b/include/d3d10.idl index ce3807b..bd4e914 100644 --- a/include/d3d10.idl +++ b/include/d3d10.idl @@ -631,18 +631,7 @@ typedef struct D3D10_RENDER_TARGET_VIEW_DESC { } DUMMYUNIONNAME; } D3D10_RENDER_TARGET_VIEW_DESC; -typedef enum D3D10_SRV_DIMENSION { - D3D10_SRV_DIMENSION_UNKNOWN, - D3D10_SRV_DIMENSION_BUFFER, - D3D10_SRV_DIMENSION_TEXTURE1D, - D3D10_SRV_DIMENSION_TEXTURE1DARRAY, - D3D10_SRV_DIMENSION_TEXTURE2D, - D3D10_SRV_DIMENSION_TEXTURE2DARRAY, - D3D10_SRV_DIMENSION_TEXTURE2DMS, - D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY, - D3D10_SRV_DIMENSION_TEXTURE3D, - D3D10_SRV_DIMENSION_TEXTURECUBE, -} D3D10_SRV_DIMENSION; +typedef D3D_SRV_DIMENSION D3D10_SRV_DIMENSION; typedef struct D3D10_BUFFER_SRV { UINT ElementOffset; diff --git a/include/d3d10_1.idl b/include/d3d10_1.idl index dc94492..c380c5a 100644 --- a/include/d3d10_1.idl +++ b/include/d3d10_1.idl @@ -68,20 +68,7 @@ typedef struct D3D10_TEXCUBE_ARRAY_SRV1 UINT NumCubes; } D3D10_TEXCUBE_ARRAY_SRV1; -typedef enum D3D10_SRV_DIMENSION1 -{ - D3D10_1_SRV_DIMENSION_UNKNOWN = 0, - D3D10_1_SRV_DIMENSION_BUFFER = 1, - D3D10_1_SRV_DIMENSION_TEXTURE1D = 2, - D3D10_1_SRV_DIMENSION_TEXTURE1DARRAY = 3, - D3D10_1_SRV_DIMENSION_TEXTURE2D = 4, - D3D10_1_SRV_DIMENSION_TEXTURE2DARRAY = 5, - D3D10_1_SRV_DIMENSION_TEXTURE2DMS = 6, - D3D10_1_SRV_DIMENSION_TEXTURE2DMSARRAY = 7, - D3D10_1_SRV_DIMENSION_TEXTURE3D = 8, - D3D10_1_SRV_DIMENSION_TEXTURECUBE = 9, - D3D10_1_SRV_DIMENSION_TEXTURECUBEARRAY = 10 -} D3D10_SRV_DIMENSION1; +typedef D3D_SRV_DIMENSION D3D10_SRV_DIMENSION1; typedef struct D3D10_SHADER_RESOURCE_VIEW_DESC1 { diff --git a/include/d3d11.idl b/include/d3d11.idl new file mode 100644 index 0000000..35df359 --- /dev/null +++ b/include/d3d11.idl @@ -0,0 +1,24 @@ +/* + * Copyright 2010 Rico Schüller + * + * 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 + */ + +import "oaidl.idl"; +import "ocidl.idl"; +import "dxgi.idl"; +import "d3dcommon.idl"; + +typedef D3D_SRV_DIMENSION D3D11_SRV_DIMENSION; diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index ffea63b..b68eb36 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -102,3 +102,52 @@ typedef enum D3D_CBUFFER_TYPE D3D11_CT_INTERFACE_POINTERS, D3D11_CT_RESOURCE_BIND_INFO, } D3D_CBUFFER_TYPE; + +typedef enum D3D_SRV_DIMENSION +{ + D3D_SRV_DIMENSION_UNKNOWN, + D3D_SRV_DIMENSION_BUFFER, + D3D_SRV_DIMENSION_TEXTURE1D, + D3D_SRV_DIMENSION_TEXTURE1DARRAY, + D3D_SRV_DIMENSION_TEXTURE2D, + D3D_SRV_DIMENSION_TEXTURE2DARRAY, + D3D_SRV_DIMENSION_TEXTURE2DMS, + D3D_SRV_DIMENSION_TEXTURE2DMSARRAY, + D3D_SRV_DIMENSION_TEXTURE3D, + D3D_SRV_DIMENSION_TEXTURECUBE, + D3D_SRV_DIMENSION_TEXTURECUBEARRAY, + D3D_SRV_DIMENSION_BUFFEREX, + D3D10_SRV_DIMENSION_UNKNOWN = 0, + D3D10_SRV_DIMENSION_BUFFER, + D3D10_SRV_DIMENSION_TEXTURE1D, + D3D10_SRV_DIMENSION_TEXTURE1DARRAY, + D3D10_SRV_DIMENSION_TEXTURE2D, + D3D10_SRV_DIMENSION_TEXTURE2DARRAY, + D3D10_SRV_DIMENSION_TEXTURE2DMS, + D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY, + D3D10_SRV_DIMENSION_TEXTURE3D, + D3D10_SRV_DIMENSION_TEXTURECUBE, + D3D10_1_SRV_DIMENSION_UNKNOWN = 0, + D3D10_1_SRV_DIMENSION_BUFFER, + D3D10_1_SRV_DIMENSION_TEXTURE1D, + D3D10_1_SRV_DIMENSION_TEXTURE1DARRAY, + D3D10_1_SRV_DIMENSION_TEXTURE2D, + D3D10_1_SRV_DIMENSION_TEXTURE2DARRAY, + D3D10_1_SRV_DIMENSION_TEXTURE2DMS, + D3D10_1_SRV_DIMENSION_TEXTURE2DMSARRAY, + D3D10_1_SRV_DIMENSION_TEXTURE3D, + D3D10_1_SRV_DIMENSION_TEXTURECUBE, + D3D10_1_SRV_DIMENSION_TEXTURECUBEARRAY, + D3D11_SRV_DIMENSION_UNKNOWN = 0, + D3D11_SRV_DIMENSION_BUFFER, + D3D11_SRV_DIMENSION_TEXTURE1D, + D3D11_SRV_DIMENSION_TEXTURE1DARRAY, + D3D11_SRV_DIMENSION_TEXTURE2D, + D3D11_SRV_DIMENSION_TEXTURE2DARRAY, + D3D11_SRV_DIMENSION_TEXTURE2DMS, + D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY, + D3D11_SRV_DIMENSION_TEXTURE3D, + D3D11_SRV_DIMENSION_TEXTURECUBE, + D3D11_SRV_DIMENSION_TEXTURECUBEARRAY, + D3D11_SRV_DIMENSION_BUFFEREX, +} D3D_SRV_DIMENSION;

1 0

Rico Schüller : include: Move D3D_CBUFFER_TYPE to d3dcommon.h.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: bc03f85f0787ad3cbf1a34a9c022e39e27c3e11c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc03f85f0787ad3cbf1a34a9c… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 25 20:30:35 2010 +0200 include: Move D3D_CBUFFER_TYPE to d3dcommon.h. --- include/d3d10shader.h | 9 +++------ include/d3d11shader.h | 2 ++ include/d3dcommon.idl | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index a711de3..658db02 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -85,12 +85,6 @@ typedef enum _D3D10_SHADER_INPUT_TYPE D3D10_SIT_SAMPLER = 3 } D3D10_SHADER_INPUT_TYPE, *LPD3D10_SHADER_INPUT_TYPE; -typedef enum D3D10_CBUFFER_TYPE -{ - D3D10_CT_CBUFFER = 0, - D3D10_CT_TBUFFER = 1 -} D3D10_CBUFFER_TYPE, *LPD3D10_CBUFFER_TYPE; - typedef enum D3D10_NAME { D3D10_NAME_UNDEFINED = 0, @@ -123,6 +117,9 @@ typedef D3D_SHADER_MACRO *LPD3D10_SHADER_MACRO; typedef D3D_SHADER_VARIABLE_CLASS D3D10_SHADER_VARIABLE_CLASS; typedef D3D_SHADER_VARIABLE_CLASS *LPD3D10_SHADER_VARIABLE_CLASS; +typedef D3D_CBUFFER_TYPE D3D10_CBUFFER_TYPE; +typedef D3D_CBUFFER_TYPE *LPD3D10_CBUFFER_TYPE; + typedef D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE; typedef ID3DInclude ID3D10Include; typedef ID3DInclude *LPD3D10INCLUDE; diff --git a/include/d3d11shader.h b/include/d3d11shader.h index 2ccb51a..f94d2b4 100644 --- a/include/d3d11shader.h +++ b/include/d3d11shader.h @@ -21,4 +21,6 @@ #include "d3dcommon.h" +typedef D3D_CBUFFER_TYPE D3D11_CBUFFER_TYPE; + #endif diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 5bee2ed..ffea63b 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -88,3 +88,17 @@ typedef enum _D3D_SHADER_VARIABLE_CLASS D3D11_SVC_INTERFACE_POINTER, D3D_SVC_FORCE_DWORD = 0x7fffffff, } D3D_SHADER_VARIABLE_CLASS; + +typedef enum D3D_CBUFFER_TYPE +{ + D3D_CT_CBUFFER, + D3D_CT_TBUFFER, + D3D_CT_INTERFACE_POINTERS, + D3D_CT_RESOURCE_BIND_INFO, + D3D10_CT_CBUFFER = 0, + D3D10_CT_TBUFFER, + D3D11_CT_CBUFFER = 0, + D3D11_CT_TBUFFER, + D3D11_CT_INTERFACE_POINTERS, + D3D11_CT_RESOURCE_BIND_INFO, +} D3D_CBUFFER_TYPE;

1 0

Rico Schüller : include: Move D3D_SHADER_VARIABLE_CLASS to d3dcommon.h.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 879f21471e50ed4748a428f89a9cb35ef795e8fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=879f21471e50ed4748a428f89… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon Oct 25 20:30:25 2010 +0200 include: Move D3D_SHADER_VARIABLE_CLASS to d3dcommon.h. --- include/d3d10shader.h | 14 +++----------- include/d3dcommon.idl | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/include/d3d10shader.h b/include/d3d10shader.h index 316f3ca..a711de3 100644 --- a/include/d3d10shader.h +++ b/include/d3d10shader.h @@ -43,17 +43,6 @@ #define D3D10_SHADER_OPTIMIZATION_LEVEL2 0xC000 #define D3D10_SHADER_OPTIMIZATION_LEVEL3 0x8000 -typedef enum _D3D10_SHADER_VARIABLE_CLASS -{ - D3D10_SVC_SCALAR, - D3D10_SVC_VECTOR, - D3D10_SVC_MATRIX_ROWS, - D3D10_SVC_MATRIX_COLUMNS, - D3D10_SVC_OBJECT, - D3D10_SVC_STRUCT, - D3D10_SVC_FORCE_DWORD = 0x7fffffff -} D3D10_SHADER_VARIABLE_CLASS, *LPD3D10_SHADER_VARIABLE_CLASS; - typedef enum _D3D10_SHADER_VARIABLE_TYPE { D3D10_SVT_VOID = 0, @@ -131,6 +120,9 @@ typedef enum D3D10_REGISTER_COMPONENT_TYPE typedef D3D_SHADER_MACRO D3D10_SHADER_MACRO; typedef D3D_SHADER_MACRO *LPD3D10_SHADER_MACRO; +typedef D3D_SHADER_VARIABLE_CLASS D3D10_SHADER_VARIABLE_CLASS; +typedef D3D_SHADER_VARIABLE_CLASS *LPD3D10_SHADER_VARIABLE_CLASS; + typedef D3D_INCLUDE_TYPE D3D10_INCLUDE_TYPE; typedef ID3DInclude ID3D10Include; typedef ID3DInclude *LPD3D10INCLUDE; diff --git a/include/d3dcommon.idl b/include/d3dcommon.idl index 217b365..5bee2ed 100644 --- a/include/d3dcommon.idl +++ b/include/d3dcommon.idl @@ -67,3 +67,24 @@ interface ID3DInclude } typedef ID3DInclude* LPD3DINCLUDE; + +typedef enum _D3D_SHADER_VARIABLE_CLASS +{ + D3D_SVC_SCALAR, + D3D_SVC_VECTOR, + D3D_SVC_MATRIX_ROWS, + D3D_SVC_MATRIX_COLUMNS, + D3D_SVC_OBJECT, + D3D_SVC_STRUCT, + D3D_SVC_INTERFACE_CLASS, + D3D_SVC_INTERFACE_POINTER, + D3D10_SVC_SCALAR = 0, + D3D10_SVC_VECTOR, + D3D10_SVC_MATRIX_ROWS, + D3D10_SVC_MATRIX_COLUMNS, + D3D10_SVC_OBJECT, + D3D10_SVC_STRUCT, + D3D11_SVC_INTERFACE_CLASS, + D3D11_SVC_INTERFACE_POINTER, + D3D_SVC_FORCE_DWORD = 0x7fffffff, +} D3D_SHADER_VARIABLE_CLASS;

1 0

Alexandre Julliard : winegcc: Detect the appropriate lib directory for 32/ 64 cross-builds.
by Alexandre Julliard Oct. 26, 2010

Oct. 26, 2010

Module: wine Branch: master Commit: 81b1c3ed60855d317ed3828b7e2378f63e5c73bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=81b1c3ed60855d317ed3828b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 25 20:42:00 2010 +0200 winegcc: Detect the appropriate lib directory for 32/64 cross-builds. --- tools/winegcc/winegcc.c | 60 ++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 57 insertions(+), 3 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 51bbead..bec4be3 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -312,6 +312,60 @@ static const strarray* get_translator(struct options *opts) return ret; } +/* check that file is a library for the correct platform */ +static int check_platform( struct options *opts, const char *file ) +{ + int ret = 0, fd = open( file, O_RDONLY ); + if (fd != -1) + { + unsigned char header[16]; + if (read( fd, header, sizeof(header) ) == sizeof(header)) + { + /* FIXME: only ELF is supported, platform is not checked beyond 32/64 */ + if (!memcmp( header, "\177ELF", 4 )) + { + if (header[4] == 2) /* 64-bit */ + ret = (opts->force_pointer_size == 8 || + (!opts->force_pointer_size && opts->target_cpu == CPU_x86_64)); + else + ret = (opts->force_pointer_size == 4 || + (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64)); + } + } + close( fd ); + } + return ret; +} + +static char *get_lib_dir( struct options *opts ) +{ + static const char *stdlibpath[] = { LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; + unsigned int i; + + for (i = 0; i < sizeof(stdlibpath)/sizeof(stdlibpath[0]); i++) + { + char *p, *buffer = xmalloc( strlen(stdlibpath[i]) + sizeof("32/libwine.so") ); + strcpy( buffer, stdlibpath[i] ); + p = buffer + strlen(buffer); + while (p > buffer && p[-1] == '/') p--; + strcpy( p, "/libwine.so" ); + if (check_platform( opts, buffer )) return buffer; + if (p > buffer + 2 && (!memcmp( p - 2, "32", 2 ) || !memcmp( p - 2, "64", 2 ))) p -= 2; + if (opts->force_pointer_size == 4 || (!opts->force_pointer_size && opts->target_cpu != CPU_x86_64)) + { + strcpy( p, "32/libwine.so" ); + if (check_platform( opts, buffer )) return buffer; + } + if (opts->force_pointer_size == 8 || (!opts->force_pointer_size && opts->target_cpu == CPU_x86_64)) + { + strcpy( p, "64/libwine.so" ); + if (check_platform( opts, buffer )) return buffer; + } + free( buffer ); + } + return xstrdup( LIBDIR ); +} + static void compile(struct options* opts, const char* lang) { strarray* comp_args = strarray_alloc(); @@ -578,7 +632,6 @@ static const char *mingw_unicode_hack( struct options *opts ) static void build(struct options* opts) { - static const char *stdlibpath[] = { DLLDIR, LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; strarray *lib_dirs, *files; strarray *spec_args, *link_args; char *output_file; @@ -628,9 +681,10 @@ static void build(struct options* opts) /* prepare the linking path */ if (!opts->wine_objdir) { + char *lib_dir = get_lib_dir( opts ); lib_dirs = strarray_dup(opts->lib_dirs); - for ( j = 0; j < sizeof(stdlibpath)/sizeof(stdlibpath[0]); j++ ) - strarray_add(lib_dirs, stdlibpath[j]); + strarray_add( lib_dirs, strmake( "%s/wine", lib_dir )); + strarray_add( lib_dirs, lib_dir ); } else {

1 0

André Hentschel : German translation of the irc template
by Jeremy Newman Oct. 26, 2010

Oct. 26, 2010

Module: website Branch: master Commit: 4c5597e868bd8028cf5ef91882fe30b4b0e43720 URL: http://source.winehq.org/git/website.git/?a=commit;h=4c5597e868bd8028cf5ef9… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Oct 20 19:45:33 2010 +0200 German translation of the irc template --- templates/de/irc.template | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/templates/de/irc.template b/templates/de/irc.template new file mode 100644 index 0000000..9a52b52 --- /dev/null +++ b/templates/de/irc.template @@ -0,0 +1,20 @@ + + + +<h1 class="title">Live Support Chat</h1> + +<p>Auf <a href="http://www.freenode.net">Freenode.net</a> gibt es einen IRC-Kanal für Wine. +Du kannst den Chatroom mit einem IRC-Programm wie z.B. <a href="http://www.xchat.org/">X-Chat</a> +betreten. Verwende folgende Einstellungen:</p> + +<blockquote> + <b>Server:</b> irc.freenode.net<br> + <b>Port:</b> 6667<br> + <b>Channel:</b> #winehq<br> +</blockquote> + +<p>Wenn du Firefox oder einen anderen Browser nutzt der IRC-Urls unterstütz, kannst du den Chat +betreten indem du auf <a href="irc://irc.freenode.net/winehq">irc://irc.freenode.net/winehq</a> +klickst.</p> + +<p> </p>

1 0

Yaron Shahrabani : (try2) website: wwn_interview translation to Hebrew
by Jeremy Newman Oct. 26, 2010

Oct. 26, 2010

Module: website Branch: master Commit: bb81e6f9928cb7b6fa0330c12cbb1eee5ab359c6 URL: http://source.winehq.org/git/website.git/?a=commit;h=bb81e6f9928cb7b6fa0330… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu Oct 21 13:26:08 2010 +0200 (try2) website: wwn_interview translation to Hebrew --002215b0410a1660d304931ecc7a Content-Type: text/plain; charset=UTF-8 Sorry, wasn't paying attention Yaron Shahrabani <Hebrew translator> On Thu, Oct 21, 2010 at 1:25 PM, Yaron Shahrabani <sh.yaron(a)gmail.com>wrote: > Kind regards, > Yaron Shahrabani > > <Hebrew translator> > > > <div dir="ltr">Sorry, wasn't paying attention<br clear="all"><div dir="ltr"><span style="font-size:large"><font color="#990000">Yaron</font><font color="#330000"> Shahrabani</font></span><blockquote style="margin:0 0 0 40px;border:none;padding:0px"> <div><font color="#666666"><span style="font-size:x-small"><font color="#FF0000"><</font></span>Hebrew translator<span style="font-size:x-small"><font color="#FF0000">></font></span></font></div></blockquote></div> <br> <br><br><div class="gmail_quote">On Thu, Oct 21, 2010 at 1:25 PM, Yaron Shahrabani <span dir="ltr"><<a href="mailto:sh.yaron(a)gmail.com">sh.yaron(a)gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"> <div dir="ltr">Kind regards,<br clear="all"><div dir="ltr"><span style="font-size:large"><font color="#990000">Yaron</font><font color="#330000"> Shahrabani</font></span><blockquote style="margin:0 0 0 40px;border:none;padding:0px"> <div><font color="#666666"><span style="font-size:x-small"><font color="#FF0000"><</font></span>Hebrew translator<span style="font-size:x-small"><font color="#FF0000">></font></span></font></div></blockquote></div> <br> </div> </blockquote></div><br></div> >From b0e5f0c56b118377fa10a19973e368d5cf530fa8 Mon Sep 17 00:00:00 2001 From: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Thu, 21 Oct 2010 13:22:46 +0200 Subject: website: wwn_interview translation. --- templates/he/wwn_interview.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/he/wwn_interview.template b/templates/he/wwn_interview.template index 31059bc..0ba2e52 100644 --- a/templates/he/wwn_interview.template +++ b/templates/he/wwn_interview.template @@ -4,7 +4,7 @@ </div> <div style="border-bottom: 1px solid #999999; margin: 20px 20px 0 20px;"> - <big>Interview with {$who}</big> + <big>ראיון עם {$who}</big> <small>by {$author}</small> </div>

1 0