wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Jacek Caban : d3d11: Use proper D3D11CreateDevice argument types.
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: wine Branch: master Commit: 0e5d64cc44ed0442aa119794a7a764c850ce1cfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e5d64cc44ed0442aa119794a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 11 12:09:04 2013 +0200 d3d11: Use proper D3D11CreateDevice argument types. --- dlls/d3d11/d3d11.spec | 2 +- dlls/d3d11/d3d11_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/d3d11.spec b/dlls/d3d11/d3d11.spec index ffe0712..52d7bcb 100644 --- a/dlls/d3d11/d3d11.spec +++ b/dlls/d3d11/d3d11.spec @@ -2,7 +2,7 @@ @ stub D3D11CoreCreateLayeredDevice @ stub D3D11CoreGetLayeredDeviceSize @ stub D3D11CoreRegisterLayers -@ stdcall D3D11CreateDevice(ptr long ptr long long long long ptr ptr ptr) +@ stdcall D3D11CreateDevice(ptr long ptr long ptr long long ptr ptr ptr) @ stub D3D11CreateDeviceAndSwapChain @ stub D3DKMTCloseAdapter @ stub D3DKMTCreateAllocation diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index b5bf8cd..87bdf4ef 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -46,10 +46,10 @@ static const char *debug_d3d_driver_type(D3D_DRIVER_TYPE driver_type) } HRESULT WINAPI D3D11CreateDevice(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, - const D3D_FEATURE_LEVEL feature_levels, UINT levels, UINT sdk_version, + const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device, D3D_FEATURE_LEVEL *feature_level, ID3D11DeviceContext **context) { - FIXME("stub: adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %d, levels %#x, sdk_version %d, " + FIXME("stub: adapter %p, driver_type %s, swrast %p, flags %#x, feature_levels %p, levels %#x, sdk_version %d, " "device %p, feature_level %p, context %p\n", adapter, debug_d3d_driver_type(driver_type), swrast, flags, feature_levels, levels, sdk_version, device, feature_level, context); return E_OUTOFMEMORY;

1 0

Piotr Caban : msvcr110: Add forwards to type_info::before function.
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: wine Branch: master Commit: d548877f6e00580a6bcd9838c2252c05ee0983ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=d548877f6e00580a6bcd9838c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Sep 11 11:52:19 2013 +0200 msvcr110: Add forwards to type_info::before function. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 6 +++--- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 3 ++- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- 9 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b4f020e..efb9dcd 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -455,7 +455,7 @@ @ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) msvcrt._wopen @ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) msvcrt._wsopen @ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) msvcrt._wsopen -@ thiscall -arch=win32 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z +@ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before@type_info@@QEBAHAEBV1@@Z @ stub -arch=win32 ?get_error_code@scheduler_resource_allocation_error@Concurrency@@QBEJXZ @ stub -arch=win64 ?get_error_code@scheduler_resource_allocation_error@Concurrency@@QEBAJXZ diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 41cb8f6..9237669 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -738,9 +738,9 @@ @ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) msvcrt._wopen @ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) msvcrt._wsopen @ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) msvcrt._wsopen -@ stub -arch=arm ?before@type_info@@QBA_NABV1@@Z -@ stub -arch=i386 ?before@type_info@@QBE_NABV1@@Z -@ stub -arch=win64 ?before@type_info@@QEBA_NAEBV1@@Z +@ cdecl -arch=arm ?before@type_info@@QBA_NABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBA_NABV1@@Z +@ thiscall -arch=i386 ?before@type_info@@QBE_NABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z +@ cdecl -arch=win64 ?before@type_info@@QEBA_NAEBV1@@Z(ptr ptr) msvcrt.?before@type_info@@QEBAHAEBV1@@Z @ stub ?current@location@Concurrency@@SA?AV12@XZ @ stub ?from_numa_node@location@Concurrency@@SA?AV12@G@Z @ stub -arch=arm ?get_error_code@scheduler_resource_allocation_error@Concurrency@@QBAJXZ diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index dc6dc03..49b2dff 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -77,7 +77,7 @@ @ cdecl ?_set_new_mode@@YAHH@Z(long) msvcrt.?_set_new_mode@@YAHH@Z @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z -@ thiscall -arch=win32 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z +@ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before@type_info@@QEBAHAEBV1@@Z @ thiscall -arch=win32 ?name@type_info@@QBEPBDXZ(ptr) msvcrt.?name@type_info@@QBEPBDXZ @ cdecl -arch=win64 ?name@type_info@@QEBAPEBDXZ(ptr) msvcrt.?name@type_info@@QEBAPEBDXZ diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 3e3cf6f..b0602b8 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -67,7 +67,7 @@ @ cdecl ?_set_new_mode@@YAHH@Z(long) msvcrt.?_set_new_mode@@YAHH@Z @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z -@ thiscall -arch=win32 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z +@ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before@type_info@@QEBAHAEBV1@@Z @ thiscall -arch=win32 ?name@type_info@@QBEPBDXZ(ptr) msvcrt.?name@type_info@@QBEPBDXZ @ cdecl -arch=win64 ?name@type_info@@QEBAPEBDXZ(ptr) msvcrt.?name@type_info@@QEBAPEBDXZ diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 6eeb602..328d2dc 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -111,7 +111,7 @@ @ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) msvcrt._wopen @ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) msvcrt._wsopen @ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) msvcrt._wsopen -@ thiscall -arch=win32 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z +@ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before@type_info@@QEBAHAEBV1@@Z @ stub -arch=win32 ?name@type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const @ stub -arch=win64 ?name@type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 04fa199..5e77362 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -111,7 +111,7 @@ @ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) msvcrt._wopen @ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) msvcrt._wsopen @ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) msvcrt._wsopen -@ thiscall -arch=win32 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z +@ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before@type_info@@QEBAHAEBV1@@Z @ stub -arch=win32 ?name@type_info@@QBEPBDPAU__type_info_node@@@Z # public: char const * __thiscall type_info::name(struct __type_info_node *)const @ stub -arch=win64 ?name@type_info@@QEBAPEBDPEAU__type_info_node@@@Z # public: char const * __ptr64 __cdecl type_info::name(struct __type_info_node * __ptr64)const __ptr64 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d0d7679..a8578bd 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -107,7 +107,8 @@ @ cdecl ?_set_new_mode@@YAHH@Z(long) MSVCRT__set_new_mode @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) MSVCRT__set_se_translator @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) MSVCRT__set_se_translator -@ thiscall -arch=win32 ?before@type_info@@QBEHABV1@@Z(ptr ptr) MSVCRT_type_info_before +@ cdecl -arch=arm ?before@type_info@@QBA_NABV1@@Z(ptr ptr) MSVCRT_type_info_before +@ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) MSVCRT_type_info_before @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) MSVCRT_type_info_before @ thiscall -arch=win32 ?name@type_info@@QBEPBDXZ(ptr) MSVCRT_type_info_name @ cdecl -arch=win64 ?name@type_info@@QEBAPEBDXZ(ptr) MSVCRT_type_info_name diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index c4200f5..5053253 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -466,7 +466,7 @@ @ stub -arch=win32 ?base@streambuf@@IBEPADXZ @ stub -arch=win64 ?base@streambuf@@IEBAPEADXZ # @ extern ?basefield@ios@@2JB -@ thiscall -arch=win32 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z +@ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before@type_info@@QEBAHAEBV1@@Z # @ extern ?binary@filebuf@@2HB @ stub ?bitalloc@ios@@SAJXZ diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 2f57ff2..1076a9d 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -67,7 +67,7 @@ @ cdecl ?_set_new_mode@@YAHH@Z(long) msvcrt.?_set_new_mode@@YAHH@Z @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) msvcrt.?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z -@ thiscall -arch=win32 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z +@ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) msvcrt.?before@type_info@@QBEHABV1@@Z @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) msvcrt.?before@type_info@@QEBAHAEBV1@@Z @ thiscall -arch=win32 ?name@type_info@@QBEPBDXZ(ptr) msvcrt.?name@type_info@@QBEPBDXZ @ cdecl -arch=win64 ?name@type_info@@QEBAPEBDXZ(ptr) msvcrt.?name@type_info@@QEBAPEBDXZ

1 0

Thomas Faber : ntdll/tests: Use correct prototype for RtlCreateUnicodeString[FromAsciiz].
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: wine Branch: master Commit: d518ce7ea2060bcd4326f0e3367f070729002031 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d518ce7ea2060bcd4326f0e33… Author: Thomas Faber <thfabba(a)gmx.de> Date: Tue Sep 10 23:56:51 2013 +0200 ntdll/tests: Use correct prototype for RtlCreateUnicodeString[FromAsciiz]. --- dlls/ntdll/tests/om.c | 2 +- dlls/ntdll/tests/reg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index c101a2e..ca84399 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -26,7 +26,7 @@ #include "stdlib.h" static HANDLE (WINAPI *pCreateWaitableTimerA)(SECURITY_ATTRIBUTES*, BOOL, LPCSTR); -static NTSTATUS (WINAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, LPCSTR); +static BOOLEAN (WINAPI *pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, LPCSTR); static VOID (WINAPI *pRtlInitUnicodeString)( PUNICODE_STRING, LPCWSTR ); static VOID (WINAPI *pRtlFreeUnicodeString)(PUNICODE_STRING); static NTSTATUS (WINAPI *pNtCreateEvent) ( PHANDLE, ACCESS_MASK, const POBJECT_ATTRIBUTES, BOOLEAN, BOOLEAN); diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 076948e..1594665 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -115,7 +115,7 @@ typedef enum _KEY_VALUE_INFORMATION_CLASS { #endif -static NTSTATUS (WINAPI * pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, LPCSTR); +static BOOLEAN (WINAPI * pRtlCreateUnicodeStringFromAsciiz)(PUNICODE_STRING, LPCSTR); static void (WINAPI * pRtlInitUnicodeString)(PUNICODE_STRING,PCWSTR); static NTSTATUS (WINAPI * pRtlFreeUnicodeString)(PUNICODE_STRING); static NTSTATUS (WINAPI * pNtDeleteValueKey)(IN HANDLE, IN PUNICODE_STRING); @@ -134,7 +134,7 @@ static NTSTATUS (WINAPI * pNtSetValueKey)(HANDLE, const PUNICODE_STRING, ULONG, ULONG, const void*, ULONG ); static NTSTATUS (WINAPI * pNtQueryInformationProcess)(HANDLE,PROCESSINFOCLASS,PVOID,ULONG,PULONG); static NTSTATUS (WINAPI * pRtlFormatCurrentUserKeyPath)(PUNICODE_STRING); -static NTSTATUS (WINAPI * pRtlCreateUnicodeString)( PUNICODE_STRING, LPCWSTR); +static BOOLEAN (WINAPI * pRtlCreateUnicodeString)(PUNICODE_STRING, LPCWSTR); static LPVOID (WINAPI * pRtlReAllocateHeap)(IN PVOID, IN ULONG, IN PVOID, IN ULONG); static NTSTATUS (WINAPI * pRtlAppendUnicodeToString)(PUNICODE_STRING, PCWSTR); static NTSTATUS (WINAPI * pRtlUnicodeStringToAnsiString)(PSTRING, PUNICODE_STRING, BOOL);

1 0

Henri Verbeet : ddraw: Avoid LPBYTE.
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: wine Branch: master Commit: 73a0327487a9cc5ee3a92c74da8d8a120fb7a0be URL: http://source.winehq.org/git/wine.git/?a=commit;h=73a0327487a9cc5ee3a92c74d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 11 08:47:52 2013 +0200 ddraw: Avoid LPBYTE. --- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 575c58f..44933d3 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -306,7 +306,7 @@ struct d3d_device DWORD vertex_type; DWORD render_flags; DWORD nb_vertices; - LPBYTE sysmem_vertex_buffer; + BYTE *sysmem_vertex_buffer; DWORD vertex_size; DWORD buffer_size; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 0c6b88e..79033fc 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -860,7 +860,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) DWORD type, data, size; size = sizeof(data); - if (!RegQueryValueExA( hkey, "ForceRefreshRate", NULL, &type, (LPBYTE)&data, &size ) && type == REG_DWORD) + if (!RegQueryValueExA(hkey, "ForceRefreshRate", NULL, &type, (BYTE *)&data, &size) && type == REG_DWORD) { TRACE("ForceRefreshRate set; overriding refresh rate to %d Hz\n", data); force_refresh_rate = data;

1 0

Henri Verbeet : ddraw: Avoid LPVOID.
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: wine Branch: master Commit: 87ef65ab7b8e3a65ab13e490f07578376aca513f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87ef65ab7b8e3a65ab13e490f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 11 08:47:51 2013 +0200 ddraw: Avoid LPVOID. --- dlls/ddraw/main.c | 57 ++++++++++----------------------- dlls/ddraw/tests/d3d.c | 3 +- dlls/ddraw/tests/ddrawmodes.c | 43 ++++++++++++------------- dlls/ddraw/tests/dsurface.c | 2 +- dlls/ddraw/tests/overlay.c | 3 +- dlls/ddraw/tests/refcount.c | 3 +- dlls/ddraw/tests/visual.c | 3 +- include/d3d.h | 56 ++++++++++++++++++-------------- include/d3dcaps.h | 2 +- include/d3dtypes.h | 13 ++++--- include/ddraw.h | 70 +++++++++++++++++++++-------------------- 11 files changed, 123 insertions(+), 132 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87ef65ab7b8e3a65ab13e…

1 0

Henri Verbeet : ddraw: Get rid of get_config_key().
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: wine Branch: master Commit: 9ccced6f411e69cf1e68a52955fc94d31c272931 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ccced6f411e69cf1e68a5295… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 11 08:47:50 2013 +0200 ddraw: Get rid of get_config_key(). --- dlls/ddraw/main.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 8e7b098..61b2586 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -819,19 +819,6 @@ DestroyCallback(IDirectDrawSurface7 *surf, } /*********************************************************************** - * get_config_key - * - * Reads a config key from the registry. Taken from WineD3D - * - ***********************************************************************/ -static inline DWORD get_config_key(HKEY defkey, HKEY appkey, const char* name, char* buffer, DWORD size) -{ - if (0 != appkey && !RegQueryValueExA( appkey, name, 0, NULL, (LPBYTE) buffer, &size )) return 0; - if (0 != defkey && !RegQueryValueExA( defkey, name, 0, NULL, (LPBYTE) buffer, &size )) return 0; - return ERROR_FILE_NOT_FOUND; -} - -/*********************************************************************** * DllMain (DDRAW.0) * * Could be used to register DirectDraw drivers, if we have more than

1 0

Henri Verbeet : wined3d: Properly check if the swapchain format is WINED3DFMT_P8_UINT in primary_render_target_is_p8 ().
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: wine Branch: master Commit: 1453baf64b95789792a9bf3a0c341d3629de9083 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1453baf64b95789792a9bf3a0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 11 08:47:49 2013 +0200 wined3d: Properly check if the swapchain format is WINED3DFMT_P8_UINT in primary_render_target_is_p8(). --- dlls/wined3d/surface.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 87ae02d..f1a3683 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1292,14 +1292,7 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum wined /* This function checks if the primary render target uses the 8bit paletted format. */ static BOOL primary_render_target_is_p8(const struct wined3d_device *device) { - if (device->fb.render_targets && device->fb.render_targets[0]) - { - const struct wined3d_surface *render_target = device->fb.render_targets[0]; - if ((render_target->resource.usage & WINED3DUSAGE_RENDERTARGET) - && (render_target->resource.format->id == WINED3DFMT_P8_UINT)) - return TRUE; - } - return FALSE; + return device->swapchains[0]->desc.backbuffer_format == WINED3DFMT_P8_UINT; } static BOOL surface_convert_color_to_float(const struct wined3d_surface *surface,

1 0

Henri Verbeet : wined3d: Get rid of the render target / overlay check in wined3d_surface_flip().
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: wine Branch: master Commit: aea8d5c11ee42642a77911a76f119e2cd9488f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aea8d5c11ee42642a77911a76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 11 08:47:48 2013 +0200 wined3d: Get rid of the render target / overlay check in wined3d_surface_flip(). The surface needs to be part of a swapchain to be flipped, but that doesn't have much to do with WINED3DUSAGE_RENDERTARGET. We can just remove the check here, because ddraw_surface7_Flip() already has the correct check. --- dlls/wined3d/surface.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index dbf6fef..87ae02d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3706,13 +3706,6 @@ HRESULT CDECL wined3d_surface_flip(struct wined3d_surface *surface, struct wined return WINEDDERR_NOTFLIPPABLE; } - /* Flipping is only supported on render targets and overlays. */ - if (!(surface->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_OVERLAY))) - { - WARN("Tried to flip a non-render target, non-overlay surface.\n"); - return WINEDDERR_NOTFLIPPABLE; - } - flip_surface(surface, override); /* Update overlays if they're visible. */

1 0

Frédéric Delanoy : wineusr: Mention forums.
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: docs Branch: master Commit: 891e03ecb915aecb34b7d797d3d013392c96d4fc URL: http://source.winehq.org/git/docs.git/?a=commit;h=891e03ecb915aecb34b7d797d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 11 10:29:58 2013 +0200 wineusr: Mention forums. --- en/wineusr-bugs.sgml | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml index 931ed6e..e251bdd 100644 --- a/en/wineusr-bugs.sgml +++ b/en/wineusr-bugs.sgml @@ -179,8 +179,9 @@ </listitem> <listitem> <para> - Wine <ulink url="http://www.winehq.org/site/forums#ml">mailing - lists</ulink> may also help, especially <literal>wine-users</literal>. The + Wine <ulink url="http://forums.winehq.org/">forums</ulink> and <ulink + url="http://www.winehq.org/site/forums">mailing lists</ulink> may also help, + especially <literal>wine-users</literal>. The <literal>wine-devel</literal> list may be appropriate depending on the type of problem you are experiencing. If you post to <literal>wine-devel</literal> you should be prepared to do a little work to help diagnose the

1 0

Frédéric Delanoy : wineusr: Assorted formatting & tagging fixes.
by Alexandre Julliard 11 Sep '13

11 Sep '13

Module: docs Branch: master Commit: 2b7c66dc429bf25d51462764d1a8f86a128f1402 URL: http://source.winehq.org/git/docs.git/?a=commit;h=2b7c66dc429bf25d51462764d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 11 10:29:57 2013 +0200 wineusr: Assorted formatting & tagging fixes. --- en/wineusr-bugs.sgml | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/en/wineusr-bugs.sgml b/en/wineusr-bugs.sgml index 5a66456..931ed6e 100644 --- a/en/wineusr-bugs.sgml +++ b/en/wineusr-bugs.sgml @@ -154,8 +154,15 @@ <para> <ulink url="http://www.freenode.net">Freenode.net</ulink> hosts an IRC channel for Wine. You can access it by using - any IRC client such as Xchat. The settings you'll need are: - server = irc.freenode.net, port = 6667, and channel = #winehq + any IRC client such as <application>Xchat</application>. The settings you'll need are: + <simplelist type="horiz" columns="2"> + <member>server</member> + <member>irc.freenode.net</member> + <member>port</member> + <member>6667</member> + <member>channel</member> + <member>#winehq</member> + </simplelist> </para> </listitem> <listitem> @@ -173,9 +180,9 @@ <listitem> <para> Wine <ulink url="http://www.winehq.org/site/forums#ml">mailing - lists</ulink> may also help, especially wine-users. The - wine-devel list may be appropriate depending on the type of - problem you are experiencing. If you post to wine-devel you + lists</ulink> may also help, especially <literal>wine-users</literal>. The + <literal>wine-devel</literal> list may be appropriate depending on the type of + problem you are experiencing. If you post to <literal>wine-devel</literal> you should be prepared to do a little work to help diagnose the problem. Read the section below to find out how to debug the source of your problem.

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2013