November 2010 - Wine-Commits

Henri Verbeet : ddraw/tests: Check for multiple expected messages in test_wndproc().
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 4c4a414596be1198a4839dcba45d2cdba739fb58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c4a414596be1198a4839dcba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 4 10:37:29 2010 +0100 ddraw/tests: Check for multiple expected messages in test_wndproc(). --- dlls/ddraw/tests/d3d.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 87a368c..bbd4bbd 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3252,11 +3252,11 @@ static void SetRenderTargetTest(void) IDirectDrawSurface7_Release(failrt); } -static UINT expect_message; +static const UINT *expect_messages; static LRESULT CALLBACK test_proc(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam) { - if (expect_message && message == expect_message) expect_message = 0; + if (expect_messages && message == *expect_messages) ++expect_messages; return DefWindowProcA(hwnd, message, wparam, lparam); } @@ -3270,6 +3270,13 @@ static void test_wndproc(void) HRESULT hr; ULONG ref; + static const UINT messages[] = + { + WM_ACTIVATE, + WM_SETFOCUS, + 0, + }; + hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); if (FAILED(hr)) { @@ -3288,7 +3295,7 @@ static void test_wndproc(void) ok(proc == (LONG_PTR)test_proc, "Expected wndproc %#lx, got %#lx.\n", (LONG_PTR)test_proc, proc); - expect_message = WM_SETFOCUS; + expect_messages = messages; hr = IDirectDraw7_SetCooperativeLevel(ddraw7, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); @@ -3298,7 +3305,8 @@ static void test_wndproc(void) goto done; } - ok(!expect_message, "Expected message %#x, but didn't receive it.\n", expect_message); + ok(!*expect_messages, "Expected message %#x, but didn't receive it.\n", *expect_messages); + expect_messages = NULL; proc = GetWindowLongPtrA(window, GWLP_WNDPROC); ok(proc != (LONG_PTR)test_proc, "Expected wndproc != %#lx, got %#lx.\n", @@ -3342,7 +3350,7 @@ static void test_wndproc(void) (LONG_PTR)DefWindowProcA, proc); done: - expect_message = 0; + expect_messages = NULL; DestroyWindow(window); UnregisterClassA("d3d7_test_wndproc_wc", GetModuleHandleA(NULL)); }

1 0

Adam Martinson : msxml3: Fix node_get_text() whitespace handling.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 85ced167bd68e882900085ea50f25897e8457172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85ced167bd68e882900085ea5… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Wed Nov 3 16:13:58 2010 -0500 msxml3: Fix node_get_text() whitespace handling. --- dlls/msxml3/msxml_private.h | 2 + dlls/msxml3/node.c | 86 ++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 139 ++++++++++++++++++++++++++----------------- 3 files changed, 172 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=85ced167bd68e88290008…

1 0

André Hentschel : kernel32: Remove dead code and old comment.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: b466d2f1bc0eb0d2528cbb30c493512f7b67e8d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b466d2f1bc0eb0d2528cbb30c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 3 18:39:47 2010 +0100 kernel32: Remove dead code and old comment. --- dlls/kernel32/powermgnt.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/powermgnt.c b/dlls/kernel32/powermgnt.c index 8d41044..6d4336d 100644 --- a/dlls/kernel32/powermgnt.c +++ b/dlls/kernel32/powermgnt.c @@ -79,18 +79,6 @@ BOOL WINAPI SetSystemPowerState(BOOL suspend_or_hibernate, BOOL force_flag) { WARN("(): stub, harmless.\n"); - /* suspend_or_hibernate flag: w95 does not support - this feature anyway */ - - for ( ;0; ) - { - if ( force_flag ) - { - } - else - { - } - } return TRUE; }

1 0

Vijay Kiran Kamuju : include: Fix signature of CreateWrap macros in d3drm.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 0985657ffa152174ff03aa50d872d491523c624f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0985657ffa152174ff03aa50d… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Nov 3 14:22:49 2010 -0400 include: Fix signature of CreateWrap macros in d3drm. --- include/d3drm.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d3drm.h b/include/d3drm.h index 1f84914..54beaab 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -155,7 +155,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) #define IDirect3DRM_CreateTextureFromSurface(p,a,b) (p)->CreateTextureFromSurface(a,b) #define IDirect3DRM_CreateShadow(p,a,b,c,d,e,f,g,h,i) (p)->CreateShadow(a,b,c,d,e,f,g,h,i) #define IDirect3DRM_CreateViewport(p,a,b,c,d,e,f,g) (p)->CreateViewport(a,b,c,d,e,f,g) -#define IDirect3DRM_CreateWrap(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) (p)->CreateWrap(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) +#define IDirect3DRM_CreateWrap(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,q) (p)->CreateWrap(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,q) #define IDirect3DRM_CreateUserVisual(p,a,b,c) (p)->CreateUserVisual(a,b,c) #define IDirect3DRM_LoadTexture(p,a,b) (p)->LoadTexture(a,b) #define IDirect3DRM_LoadTextureFromResource(p,a,b) (p)->LoadTextureFromResource(a,b) @@ -291,7 +291,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) #define IDirect3DRM2_CreateTextureFromSurface(p,a,b) (p)->CreateTextureFromSurface(a,b) #define IDirect3DRM2_CreateShadow(p,a,b,c,d,e,f,g,h,i) (p)->CreateShadow(a,b,c,d,e,f,g,h,i) #define IDirect3DRM2_CreateViewport(p,a,b,c,d,e,f,g) (p)->CreateViewport(a,b,c,d,e,f,g) -#define IDirect3DRM2_CreateWrap(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) (p)->CreateWrap(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) +#define IDirect3DRM2_CreateWrap(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,q) (p)->CreateWrap(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,q) #define IDirect3DRM2_CreateUserVisual(p,a,b,c) (p)->CreateUserVisual(a,b,c) #define IDirect3DRM2_LoadTexture(p,a,b) (p)->LoadTexture(a,b) #define IDirect3DRM2_LoadTextureFromResource(p,a,b,c,d) (p)->LoadTextureFromResource(a,b,c,d) @@ -438,7 +438,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) #define IDirect3DRM3_CreateTextureFromSurface(p,a,b) (p)->CreateTextureFromSurface(a,b) #define IDirect3DRM3_CreateShadow(p,a,b,c,d,e,f,g,h,i) (p)->CreateShadow(a,b,c,d,e,f,g,h,i) #define IDirect3DRM3_CreateViewport(p,a,b,c,d,e,f,g) (p)->CreateViewport(a,b,c,d,e,f,g) -#define IDirect3DRM3_CreateWrap(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) (p)->CreateWrap(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) +#define IDirect3DRM3_CreateWrap(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,q) (p)->CreateWrap(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,q) #define IDirect3DRM3_CreateUserVisual(p,a,b,c) (p)->CreateUserVisual(a,b,c) #define IDirect3DRM3_LoadTexture(p,a,b) (p)->LoadTexture(a,b) #define IDirect3DRM3_LoadTextureFromResource(p,a,b,c,d) (p)->LoadTextureFromResource(a,b,c,d)

1 0

André Hentschel : ntdll: Detect more processor features.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 3151ef0d069798c4299d3ff91393f712639fbcc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3151ef0d069798c4299d3ff91… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 3 18:53:45 2010 +0100 ntdll: Detect more processor features. --- dlls/ntdll/nt.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index b323c23..13beb74 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1049,6 +1049,8 @@ void fill_cpu_info(void) { if (strstr(value, "cx8")) user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE; + if (strstr(value, "cx16")) + user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE128] = TRUE; if (strstr(value, "mmx")) user_shared_data->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; if (strstr(value, "tsc")) @@ -1061,6 +1063,8 @@ void fill_cpu_info(void) user_shared_data->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = TRUE; if (strstr(value, "sse2")) user_shared_data->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = TRUE; + if (strstr(value, "pni")) + user_shared_data->ProcessorFeatures[PF_SSE3_INSTRUCTIONS_AVAILABLE] = TRUE; if (strstr(value, "pae")) user_shared_data->ProcessorFeatures[PF_PAE_ENABLED] = TRUE; if (strstr(value, "ht")) @@ -1275,11 +1279,13 @@ void fill_cpu_info(void) { cached_sci.Revision |= value; if (strstr(buffer, "CX8")) user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE_DOUBLE] = TRUE; + if (strstr(buffer, "CX16")) user_shared_data->ProcessorFeatures[PF_COMPARE_EXCHANGE128] = TRUE; if (strstr(buffer, "MMX")) user_shared_data->ProcessorFeatures[PF_MMX_INSTRUCTIONS_AVAILABLE] = TRUE; if (strstr(buffer, "TSC")) user_shared_data->ProcessorFeatures[PF_RDTSC_INSTRUCTION_AVAILABLE] = TRUE; if (strstr(buffer, "3DNOW")) user_shared_data->ProcessorFeatures[PF_3DNOW_INSTRUCTIONS_AVAILABLE] = TRUE; if (strstr(buffer, "SSE")) user_shared_data->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE] = TRUE; if (strstr(buffer, "SSE2")) user_shared_data->ProcessorFeatures[PF_XMMI64_INSTRUCTIONS_AVAILABLE] = TRUE; + if (strstr(buffer, "SSE3")) user_shared_data->ProcessorFeatures[PF_SSE3_INSTRUCTIONS_AVAILABLE] = TRUE; if (strstr(buffer, "PAE")) user_shared_data->ProcessorFeatures[PF_PAE_ENABLED] = TRUE; } break; /* CPU_TYPE_I386 */

1 0

André Hentschel : include: Define PROCESSOR_OPTIL ( MSIL).
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 0e524aaaeaa0b1c38505c0de243992cd795f1b82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e524aaaeaa0b1c38505c0de2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 3 18:40:43 2010 +0100 include: Define PROCESSOR_OPTIL (MSIL). --- include/winnt.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 04f6dfd..e6f9b3c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -556,6 +556,7 @@ typedef DWORD FLONG; #define PROCESSOR_ARM820 2080 /* 0x820 */ #define PROCESSOR_ARM920 2336 /* 0x920 */ #define PROCESSOR_ARM_7TDMI 70001 +#define PROCESSOR_OPTIL 18767 #ifdef _WIN64 #define MAXIMUM_PROCESSORS 64

1 0

Vijay Kiran Kamuju : include: Add IDirect3DRMWinDevice interface.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: wine Branch: master Commit: 6c3581461b58fcf56ce91f41fe12d7403b2fa6bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c3581461b58fcf56ce91f41f… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Nov 3 14:33:04 2010 -0400 include: Add IDirect3DRMWinDevice interface. --- include/Makefile.in | 1 + include/d3drmwin.h | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 733e4cc..1f434c7 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -169,6 +169,7 @@ SRCDIR_INCLUDES = \ d3drm.h \ d3drmdef.h \ d3drmobj.h \ + d3drmwin.h \ d3dtypes.h \ d3dvec.inl \ d3dx9.h \ diff --git a/include/d3drmwin.h b/include/d3drmwin.h new file mode 100644 index 0000000..73b628f --- /dev/null +++ b/include/d3drmwin.h @@ -0,0 +1,103 @@ +/* + * Copyright (C) 2010 Vijay Kiran Kamuju + * + * 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 __D3DRMWIN_H__ +#define __D3DRMWIN_H__ + +#include <d3drm.h> +#include <ddraw.h> +#include <d3d.h> + +#ifdef __cplusplus +extern "C" { +#endif + +/***************************************************************************** + * Direct3DRMWinDevice interface GUID + */ + +DEFINE_GUID(IID_IDirect3DRMWinDevice, 0xc5016cc0, 0xd273, 0x11ce, 0xac, 0x48, 0x00, 0x00, 0xc0, 0x38, 0x25, 0xa1); + +typedef struct IDirect3DRMWinDevice *LPDIRECT3DRMWINDEVICE, **LPLPDIRECT3DRMWINDEVICE; + +/***************************************************************************** + * IDirect3DRMWinDevice interface + */ +#define INTERFACE IDirect3DRMWinDevice +DECLARE_INTERFACE_(IDirect3DRMWinDevice,IDirect3DRMObject) +{ + /*** IUnknown methods ***/ + STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + /*** IDirect3DRMObject methods ***/ + STDMETHOD(Clone)(THIS_ LPUNKNOWN pUnkOuter, REFIID riid, LPVOID *ppvObj) PURE; + STDMETHOD(AddDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; + STDMETHOD(DeleteDestroyCallback)(THIS_ D3DRMOBJECTCALLBACK, LPVOID argument) PURE; + STDMETHOD(SetAppData)(THIS_ DWORD data) PURE; + STDMETHOD_(DWORD, GetAppData)(THIS) PURE; + STDMETHOD(SetName)(THIS_ LPCSTR) PURE; + STDMETHOD(GetName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + STDMETHOD(GetClassName)(THIS_ LPDWORD lpdwSize, LPSTR lpName) PURE; + /*** IDirect3DRMWinDevice methods ***/ + STDMETHOD(HandlePaint)(THIS_ HDC) PURE; + STDMETHOD(HandleActivate)(THIS_ WORD) PURE; +}; +#undef INTERFACE + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define IDirect3DRMWinDevice_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define IDirect3DRMWinDevice_AddRef(p) (p)->lpVtbl->AddRef(p) +#define IDirect3DRMWinDevice_Release(p) (p)->lpVtbl->Release(p) +/*** IDirect3DRMObject methods ***/ +#define IDirect3DRMWinDevice_Clone(p,a,b,c) (p)->lpVtbl->Clone(p,a,b,c) +#define IDirect3DRMWinDevice_AddDestroyCallback(p,a,b) (p)->lpVtbl->AddDestroyCallback(p,a,b) +#define IDirect3DRMWinDevice_DeleteDestroyCallback(p,a,b) (p)->lpVtbl->DeleteDestroyCallback(p,a,b) +#define IDirect3DRMWinDevice_SetAppData(p,a) (p)->lpVtbl->SetAppData(p,a) +#define IDirect3DRMWinDevice_GetAppData(p) (p)->lpVtbl->GetAppData(p) +#define IDirect3DRMWinDevice_SetName(p,a) (p)->lpVtbl->SetName(p,a) +#define IDirect3DRMWinDevice_GetName(p,a,b) (p)->lpVtbl->GetName(p,a,b) +#define IDirect3DRMWinDevice_GetClassName(p,a,b) (p)->lpVtbl->GetClassName(p,a,b) +/*** IDirect3DRMWinDevice methods ***/ +#define IDirect3DRMWinDevice_HandlePaint(p,a) (p)->lpVtbl->HandlePaint(p,a) +#define IDirect3DRMWinDevice_HandleActivate(p,a) (p)->lpVtbl->HandleActivate(p,a) +#else +/*** IUnknown methods ***/ +#define IDirect3DRMWinDevice_QueryInterface(p,a,b) (p)->QueryInterface(a,b) +#define IDirect3DRMWinDevice_AddRef(p) (p)->AddRef() +#define IDirect3DRMwinDevice_Release(p) (p)->Release() +/*** IDirect3DRMObject methods ***/ +#define IDirect3DRMWinDevice_Clone(p,a,b,c) (p)->Clone(a,b,c) +#define IDirect3DRMWinDevice_AddDestroyCallback(p,a,b) (p)->AddDestroyCallback(a,b) +#define IDirect3DRMWinDevice_DeleteDestroyCallback(p,a,b) (p)->DeleteDestroyCallback(a,b) +#define IDirect3DRMWinDevice_SetAppData(p,a) (p)->SetAppData(a) +#define IDirect3DRMWinDevice_GetAppData(p) (p)->GetAppData() +#define IDirect3DRMWinDevice_SetName(p,a) (p)->SetName(a) +#define IDirect3DRMWinDevice_GetName(p,a,b) (p)->GetName(a,b) +#define IDirect3DRMWinDevice_GetClassName(p,a,b) (p)->GetClassName(a,b) +/*** IDirect3DRMWinDevice methods ***/ +#define IDirect3DRMWinDevice_HandlePaint(p,a) (p)->HandlePaint(a) +#define IDirect3DRMWinDevice_HandleActivate(p,a) (p)->HandleActivate(a) +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* __D3DRMWIN_H__ */

1 0

André Hentschel : winedev: Replace some cvs stuff.
by Alexandre Julliard Nov. 4, 2010

Nov. 4, 2010

Module: docs Branch: master Commit: 2372f007945ec881ebbc86e1be1786716402d686 URL: http://source.winehq.org/git/docs.git/?a=commit;h=2372f007945ec881ebbc86e1b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 3 19:44:35 2010 +0100 winedev: Replace some cvs stuff. --- en/winedev-documentation.sgml | 4 ++-- en/winedev-windowing.sgml | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/en/winedev-documentation.sgml b/en/winedev-documentation.sgml index 141796d..bf7f9d1 100644 --- a/en/winedev-documentation.sgml +++ b/en/winedev-documentation.sgml @@ -74,8 +74,8 @@ </para> <para> - To obtain a copy of the Wine documentation from Sourceforge refer to - <ulink url="http://www.winehq.com/site/cvs#docs">the Wine CVS page</> for instructions. + To obtain a copy of the Wine documentation refer to + <ulink url="http://source.winehq.org/git/docs.git/">the Documentation Git tree</>. </para> <para> diff --git a/en/winedev-windowing.sgml b/en/winedev-windowing.sgml index 2b61aba..10ddf5b 100644 --- a/en/winedev-windowing.sgml +++ b/en/winedev-windowing.sgml @@ -540,9 +540,8 @@ WORD cmd; </para> <para> To do this, open the file - <filename>dlls/x11drv/keyboard.c</filename> and take a look - at the existing tables. Make a backup copy of it, especially - if you don't use CVS. + <filename>dlls/winex11.drv/keyboard.c</filename> and take a look + at the existing tables. </para> <para> What you really would need to do, is find out which scancode

1 0

André Hentschel : Replace some cvs stuff
by Jeremy Newman Nov. 3, 2010

Nov. 3, 2010

Module: website Branch: master Commit: 4aed87ed5f4d1575b1a04c0e4024c37a4ff95119 URL: http://source.winehq.org/git/website.git/?a=commit;h=4aed87ed5f4d1575b1a04c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 3 19:45:02 2010 +0100 Replace some cvs stuff --- templates/de/contributing.template | 5 ++--- templates/en/contributing.template | 2 +- templates/en/status/wine.template | 2 +- templates/he/contributing.template | 2 +- templates/he/status/wine.template | 2 +- templates/pt/contributing.template | 4 ++-- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/templates/de/contributing.template b/templates/de/contributing.template index ff3333d..a1c94eb 100644 --- a/templates/de/contributing.template +++ b/templates/de/contributing.template @@ -265,8 +265,7 @@ Wine hat einen ständigen Bedarf an Aktualisierungen der Dokumentation. Wine hat seine "<a href="{$root}/site/documentation">Anleitungen (en)</a>", wie den Wine User Guide etc. Die SGML-Quellen der Anleitungen befinden sich in einem - <a href="http://www.winehq.org/site/cvs#docs">separatem CVS Zweig auf - Sourceforge</a>. + <a href="http://source.winehq.org/git/docs.git/">separate Git Zweig</a>. Weitere wichtige Dokumentationen sind die README Datei und die man pages und anderen Dateien im documentation Verzeichnis. Deine Aufgabe wäre es sicherzustellen, dass jeder Patch, der von einem @@ -276,7 +275,7 @@ Entwickler fragen, was ihr Patch im Einzelnen macht (und vergiss nicht, den Entwicklern einen zu verpassen, die die Arbeitsweise ihres Patches überhaupt nicht dokumentiert haben!). -Die Aktualisierung der Dokumentation findet statt, in dem Du "CVS Diffs" der +Die Aktualisierung der Dokumentation findet statt, in dem Du "Git Diffs" der entsprechenden Dateien an wine-patches schickst. Benötigte Fertigkeiten/Kenntnisse: diff --git a/templates/en/contributing.template b/templates/en/contributing.template index d292086..f868af5 100644 --- a/templates/en/contributing.template +++ b/templates/en/contributing.template @@ -245,7 +245,7 @@ functionality and optionally asking developers about what their patch truly does (and of course don't forget to beat up developers that don't document the workings of their patch at all!). -The documentation updates would be done by sending "cvs diff"s of the +The documentation updates would be done by sending "git diff"s of the relevant files to wine-patches. Requirements: <ul> diff --git a/templates/en/status/wine.template b/templates/en/status/wine.template index f2b8a9d..265e606 100644 --- a/templates/en/status/wine.template +++ b/templates/en/status/wine.template @@ -558,7 +558,7 @@ </tr> <tr> <td>Wine DLL dump utility (winedump)</td> - <td class="good"><a href="http://cvs.winehq.org/cvsweb/wine/tools/winedump/README">Good</a></td> + <td class="good"><a href="http://source.winehq.org/git/wine.git/?a=blob;f=tools/winedump/README">Good</a></td> <td><a href="{$root}/wwn/305#Demangling%20Symbols">#305</a></td> <td class="pct90">90% complete</td> <td></td> diff --git a/templates/he/contributing.template b/templates/he/contributing.template index ed009ed..088b5b5 100644 --- a/templates/he/contributing.template +++ b/templates/he/contributing.template @@ -243,7 +243,7 @@ functionality and optionally asking developers about what their patch truly does (and of course don't forget to beat up developers that don't document the workings of their patch at all!). -The documentation updates would be done by sending "cvs diff"s of the +The documentation updates would be done by sending "git diff"s of the relevant files to wine-patches. Requirements: <ul> diff --git a/templates/he/status/wine.template b/templates/he/status/wine.template index f2b8a9d..265e606 100644 --- a/templates/he/status/wine.template +++ b/templates/he/status/wine.template @@ -558,7 +558,7 @@ </tr> <tr> <td>Wine DLL dump utility (winedump)</td> - <td class="good"><a href="http://cvs.winehq.org/cvsweb/wine/tools/winedump/README">Good</a></td> + <td class="good"><a href="http://source.winehq.org/git/wine.git/?a=blob;f=tools/winedump/README">Good</a></td> <td><a href="{$root}/wwn/305#Demangling%20Symbols">#305</a></td> <td class="pct90">90% complete</td> <td></td> diff --git a/templates/pt/contributing.template b/templates/pt/contributing.template index baaf979..e3a1e46 100644 --- a/templates/pt/contributing.template +++ b/templates/pt/contributing.template @@ -255,7 +255,7 @@ O Wine está constantemente a necessitar de actualizações à documentação. O Wine tem os seus "<a href="{$root}/site/documentation">Guias</a>" tais como o Wine User Guide etc. O código fonte SGML pode ser encontrado numa - <a href="http://www.winehq.org/site/cvs#docs">árvore CVS à parte na Sourceforge</a>. + <a href="http://source.winehq.org/git/docs.git/">árvore Git à parte</a>. Outros items de documentação importantes são o ficheiro README, as páginas man e outros ficheiros no directório de documentação. O seu trabalho seria certificar-se de que a cada correcção que um programador @@ -264,7 +264,7 @@ a nova funcionalidade e opcionalmente perguntando ao programador o que é que o seu patch faz realmente (e claro não se esqueça de bater em programadores que não documentam nada do funcionamento dos seus patchs!). -As actualizações à documentação seriam efectuadas enviando "diffs cvs" dos +As actualizações à documentação seriam efectuadas enviando "diffs git" dos ficheiros relevantes para o wine-patches. Requisitos: <ul>

1 0

Hans Leidekker : msi: Components don't require a key path.
by Alexandre Julliard Nov. 3, 2010

Nov. 3, 2010

Module: wine Branch: master Commit: 566e67a491306e31e21773252255e9d04b9d7737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=566e67a491306e31e21773252… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Nov 3 15:04:49 2010 +0100 msi: Components don't require a key path. --- dlls/msi/action.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 3ebf286..8a25c1a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3358,10 +3358,11 @@ static UINT ITERATE_RegisterTypeLibraries(MSIRECORD *row, LPVOID param) } comp->Action = INSTALLSTATE_LOCAL; - file = get_loaded_file( package, comp->KeyPath ); - if (!file) + if (!comp->KeyPath || !(file = get_loaded_file( package, comp->KeyPath ))) + { + TRACE("component has no key path\n"); return ERROR_SUCCESS; - + } ui_actiondata( package, szRegisterTypeLibraries, row ); module = LoadLibraryExW( file->TargetPath, NULL, LOAD_LIBRARY_AS_DATAFILE );

1 0