January 2014 - Wine-commits

Martin Storsjo : api-ms-win-core-string-l1-1-0: Add stub dll.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 463bf7bb6153441a8b6dbe25696a0079c194b2d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=463bf7bb6153441a8b6dbe256… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:26 2014 +0200 api-ms-win-core-string-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-string-l1-1-0/Makefile.in | 1 + .../api-ms-win-core-string-l1-1-0.spec | 8 ++++++++ tools/make_specfiles | 1 + 5 files changed, 13 insertions(+) diff --git a/configure b/configure index 5af9383..41a0b2c 100755 --- a/configure +++ b/configure @@ -860,6 +860,7 @@ enable_api_ms_win_core_localregistry_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_profile_l1_1_0 +enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 @@ -16576,6 +16577,7 @@ wine_fn_config_dll api-ms-win-core-localregistry-l1-1-0 enable_api_ms_win_core_l wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_processthreads_l1_1_0 wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 +wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 2e2bb95..9ec46f2 100644 --- a/configure.ac +++ b/configure.ac @@ -2632,6 +2632,7 @@ WINE_CONFIG_DLL(api-ms-win-core-localregistry-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-string-l1-1-0/Makefile.in b/dlls/api-ms-win-core-string-l1-1-0/Makefile.in new file mode 100644 index 0000000..4d41488 --- /dev/null +++ b/dlls/api-ms-win-core-string-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-string-l1-1-0.dll diff --git a/dlls/api-ms-win-core-string-l1-1-0/api-ms-win-core-string-l1-1-0.spec b/dlls/api-ms-win-core-string-l1-1-0/api-ms-win-core-string-l1-1-0.spec new file mode 100644 index 0000000..5159f98 --- /dev/null +++ b/dlls/api-ms-win-core-string-l1-1-0/api-ms-win-core-string-l1-1-0.spec @@ -0,0 +1,8 @@ +@ stdcall CompareStringEx(wstr long wstr long wstr long ptr ptr long) kernel32.CompareStringEx +@ stdcall CompareStringOrdinal(wstr long wstr long long) kernel32.CompareStringOrdinal +@ stdcall CompareStringW(long long wstr long wstr long) kernel32.CompareStringW +@ stdcall FoldStringW(long wstr long ptr long) kernel32.FoldStringW +@ stdcall GetStringTypeExW(long long wstr long ptr) kernel32.GetStringTypeExW +@ stdcall GetStringTypeW(long wstr long ptr) kernel32.GetStringTypeW +@ stdcall MultiByteToWideChar(long long str long ptr long) kernel32.MultiByteToWideChar +@ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) kernel32.WideCharToMultiByte diff --git a/tools/make_specfiles b/tools/make_specfiles index 5cfe758..928d4b8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -141,6 +141,7 @@ my @dll_groups = "api-ms-win-core-errorhandling-l1-1-1", "api-ms-win-core-interlocked-l1-2-0", "api-ms-win-core-profile-l1-1-0", + "api-ms-win-core-string-l1-1-0", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-sysinfo-l1-2-0: Add stub dll.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 6f174587937f7065ca62702e2258f965a9fb0ea8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f174587937f7065ca62702e2… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:27 2014 +0200 api-ms-win-core-sysinfo-l1-2-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-sysinfo-l1-2-0/Makefile.in | 1 + .../api-ms-win-core-sysinfo-l1-2-0.spec | 31 ++++++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 36 insertions(+) diff --git a/configure b/configure index 41a0b2c..e45776c 100755 --- a/configure +++ b/configure @@ -861,6 +861,7 @@ enable_api_ms_win_core_processthreads_l1_1_0 enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_string_l1_1_0 +enable_api_ms_win_core_sysinfo_l1_2_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 @@ -16578,6 +16579,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-0 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_processthreads_l1_1_1 wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 +wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index 9ec46f2..f36dbd7 100644 --- a/configure.ac +++ b/configure.ac @@ -2633,6 +2633,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-0/Makefile.in b/dlls/api-ms-win-core-sysinfo-l1-2-0/Makefile.in new file mode 100644 index 0000000..856ae15 --- /dev/null +++ b/dlls/api-ms-win-core-sysinfo-l1-2-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-sysinfo-l1-2-0.dll diff --git a/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec b/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec new file mode 100644 index 0000000..47f4419 --- /dev/null +++ b/dlls/api-ms-win-core-sysinfo-l1-2-0/api-ms-win-core-sysinfo-l1-2-0.spec @@ -0,0 +1,31 @@ +@ stub EnumSystemFirmwareTables +@ stdcall GetComputerNameExA(long ptr ptr) kernel32.GetComputerNameExA +@ stdcall GetComputerNameExW(long ptr ptr) kernel32.GetComputerNameExW +@ stdcall GetLocalTime(ptr) kernel32.GetLocalTime +@ stdcall GetLogicalProcessorInformation(ptr ptr) kernel32.GetLogicalProcessorInformation +@ stdcall GetLogicalProcessorInformationEx(long ptr ptr) kernel32.GetLogicalProcessorInformationEx +@ stdcall GetNativeSystemInfo(ptr) kernel32.GetNativeSystemInfo +@ stub GetOsSafeBootMode +@ stdcall GetProductInfo(long long long long ptr) kernel32.GetProductInfo +@ stdcall GetSystemDirectoryA(ptr long) kernel32.GetSystemDirectoryA +@ stdcall GetSystemDirectoryW(ptr long) kernel32.GetSystemDirectoryW +@ stub GetSystemFirmwareTable +@ stdcall GetSystemInfo(ptr) kernel32.GetSystemInfo +@ stdcall GetSystemTime(ptr) kernel32.GetSystemTime +@ stdcall GetSystemTimeAdjustment(ptr ptr ptr) kernel32.GetSystemTimeAdjustment +@ stdcall GetSystemTimeAsFileTime(ptr) kernel32.GetSystemTimeAsFileTime +@ stub GetSystemTimePreciseAsFileTime +@ stdcall GetSystemWindowsDirectoryA(ptr long) kernel32.GetSystemWindowsDirectoryA +@ stdcall GetSystemWindowsDirectoryW(ptr long) kernel32.GetSystemWindowsDirectoryW +@ stdcall GetTickCount() kernel32.GetTickCount +@ stdcall -ret64 GetTickCount64() kernel32.GetTickCount64 +@ stdcall GetVersion() kernel32.GetVersion +@ stdcall GetVersionExA(ptr) kernel32.GetVersionExA +@ stdcall GetVersionExW(ptr) kernel32.GetVersionExW +@ stdcall GetWindowsDirectoryA(ptr long) kernel32.GetWindowsDirectoryA +@ stdcall GetWindowsDirectoryW(ptr long) kernel32.GetWindowsDirectoryW +@ stdcall GlobalMemoryStatusEx(ptr) kernel32.GlobalMemoryStatusEx +@ stdcall SetComputerNameExW(long wstr) kernel32.SetComputerNameExW +@ stdcall SetLocalTime(ptr) kernel32.SetLocalTime +@ stdcall SetSystemTime(ptr) kernel32.SetSystemTime +@ stdcall -ret64 VerSetConditionMask(long long long long) kernel32.VerSetConditionMask diff --git a/tools/make_specfiles b/tools/make_specfiles index 928d4b8..2edb446 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -142,6 +142,7 @@ my @dll_groups = "api-ms-win-core-interlocked-l1-2-0", "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-string-l1-1-0", + "api-ms-win-core-sysinfo-l1-2-0", ], [ "ole32",

1 0

Martin Storsjo : api-ms-win-core-util-l1-1-0: Add stub dll.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 8d9ecf70e258b4fd76e43b869954974194154deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d9ecf70e258b4fd76e43b869… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Jan 8 14:48:28 2014 +0200 api-ms-win-core-util-l1-1-0: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-util-l1-1-0/Makefile.in | 1 + dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec | 5 +++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) diff --git a/configure b/configure index e45776c..a41afa4 100755 --- a/configure +++ b/configure @@ -862,6 +862,7 @@ enable_api_ms_win_core_processthreads_l1_1_1 enable_api_ms_win_core_profile_l1_1_0 enable_api_ms_win_core_string_l1_1_0 enable_api_ms_win_core_sysinfo_l1_2_0 +enable_api_ms_win_core_util_l1_1_0 enable_api_ms_win_core_winrt_error_l1_1_0 enable_api_ms_win_core_winrt_string_l1_1_0 enable_api_ms_win_downlevel_advapi32_l1_1_0 @@ -16580,6 +16581,7 @@ wine_fn_config_dll api-ms-win-core-processthreads-l1-1-1 enable_api_ms_win_core_ wine_fn_config_dll api-ms-win-core-profile-l1-1-0 enable_api_ms_win_core_profile_l1_1_0 wine_fn_config_dll api-ms-win-core-string-l1-1-0 enable_api_ms_win_core_string_l1_1_0 wine_fn_config_dll api-ms-win-core-sysinfo-l1-2-0 enable_api_ms_win_core_sysinfo_l1_2_0 +wine_fn_config_dll api-ms-win-core-util-l1-1-0 enable_api_ms_win_core_util_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-error-l1-1-0 enable_api_ms_win_core_winrt_error_l1_1_0 wine_fn_config_dll api-ms-win-core-winrt-string-l1-1-0 enable_api_ms_win_core_winrt_string_l1_1_0 wine_fn_config_dll api-ms-win-downlevel-advapi32-l1-1-0 enable_api_ms_win_downlevel_advapi32_l1_1_0 diff --git a/configure.ac b/configure.ac index f36dbd7..3d3e039 100644 --- a/configure.ac +++ b/configure.ac @@ -2634,6 +2634,7 @@ WINE_CONFIG_DLL(api-ms-win-core-processthreads-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-profile-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-sysinfo-l1-2-0) +WINE_CONFIG_DLL(api-ms-win-core-util-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-error-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-winrt-string-l1-1-0) WINE_CONFIG_DLL(api-ms-win-downlevel-advapi32-l1-1-0) diff --git a/dlls/api-ms-win-core-util-l1-1-0/Makefile.in b/dlls/api-ms-win-core-util-l1-1-0/Makefile.in new file mode 100644 index 0000000..4e2321d --- /dev/null +++ b/dlls/api-ms-win-core-util-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-util-l1-1-0.dll diff --git a/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec b/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec new file mode 100644 index 0000000..471ee42 --- /dev/null +++ b/dlls/api-ms-win-core-util-l1-1-0/api-ms-win-core-util-l1-1-0.spec @@ -0,0 +1,5 @@ +@ stdcall Beep(long long) kernel32.Beep +@ stdcall DecodePointer(ptr) kernel32.DecodePointer +@ stub DecodeSystemPointer +@ stdcall EncodePointer(ptr) kernel32.EncodePointer +@ stub EncodeSystemPointer diff --git a/tools/make_specfiles b/tools/make_specfiles index 2edb446..38917eb 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -143,6 +143,7 @@ my @dll_groups = "api-ms-win-core-profile-l1-1-0", "api-ms-win-core-string-l1-1-0", "api-ms-win-core-sysinfo-l1-2-0", + "api-ms-win-core-util-l1-1-0", ], [ "ole32",

1 0

Stefan Dösinger : wined3d: Support custom pitches in wined3d_surface_update_desc.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 70eab9d025c163aa039ada7edb751774defacbe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70eab9d025c163aa039ada7ed… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 7 22:12:12 2014 +0100 wined3d: Support custom pitches in wined3d_surface_update_desc. --- dlls/wined3d/surface.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2fca299..7b96a21 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2861,7 +2861,10 @@ HRESULT CDECL wined3d_surface_update_desc(struct wined3d_surface *surface, surface->resource.format = format; surface->resource.multisample_type = multisample_type; surface->resource.multisample_quality = multisample_quality; - surface->resource.size = resource_size; + if (surface->pitch) + surface->resource.size = height * surface->pitch; + else + surface->resource.size = resource_size; if (create_dib) {

1 0

Stefan Dösinger : ddraw: Always set surface width, height and format in ddraw_surface7_SetSurfaceDesc.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 2a012ba16ff03e90cb51a7db4bf9f7b1e8781b78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a012ba16ff03e90cb51a7db4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 7 22:12:13 2014 +0100 ddraw: Always set surface width, height and format in ddraw_surface7_SetSurfaceDesc. --- dlls/ddraw/surface.c | 44 ++++++++++++++------------------------------ 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 96f6950..4abe3bf 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4278,7 +4278,6 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, const DWORD allowed_flags = DDSD_LPSURFACE | DDSD_PIXELFORMAT | DDSD_WIDTH | DDSD_HEIGHT | DDSD_PITCH | DDSD_CAPS; enum wined3d_format_id format_id; - BOOL update_wined3d = FALSE; UINT pitch, width, height; TRACE("iface %p, surface_desc %p, flags %#x.\n", iface, DDSD, Flags); @@ -4332,15 +4331,9 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; } if (DDSD->dwWidth != This->surface_desc.dwWidth) - { TRACE("Surface width changed from %u to %u.\n", This->surface_desc.dwWidth, DDSD->dwWidth); - update_wined3d = TRUE; - } if (DDSD->u1.lPitch != This->surface_desc.u1.lPitch) - { TRACE("Surface pitch changed from %u to %u.\n", This->surface_desc.u1.lPitch, DDSD->u1.lPitch); - update_wined3d = TRUE; - } pitch = DDSD->u1.lPitch; width = DDSD->dwWidth; } @@ -4363,10 +4356,7 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, return DDERR_INVALIDPARAMS; } if (DDSD->dwHeight != This->surface_desc.dwHeight) - { TRACE("Surface height changed from %u to %u.\n", This->surface_desc.dwHeight, DDSD->dwHeight); - update_wined3d = TRUE; - } height = DDSD->dwHeight; } else @@ -4388,36 +4378,30 @@ static HRESULT WINAPI ddraw_surface7_SetSurfaceDesc(IDirectDrawSurface7 *iface, } current_format_id = wined3dformat_from_ddrawformat(&This->surface_desc.u4.ddpfPixelFormat); if (format_id != current_format_id) - { TRACE("Surface format changed from %#x to %#x.\n", current_format_id, format_id); - update_wined3d = TRUE; - } } else { format_id = wined3dformat_from_ddrawformat(&This->surface_desc.u4.ddpfPixelFormat); } - if (update_wined3d) + if (FAILED(hr = wined3d_surface_update_desc(This->wined3d_surface, width, height, + format_id, WINED3D_MULTISAMPLE_NONE, 0))) { - if (FAILED(hr = wined3d_surface_update_desc(This->wined3d_surface, width, height, - format_id, WINED3D_MULTISAMPLE_NONE, 0))) - { - WARN("Failed to update surface desc, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; - } - - if (DDSD->dwFlags & DDSD_WIDTH) - This->surface_desc.dwWidth = width; - if (DDSD->dwFlags & DDSD_PITCH) - This->surface_desc.u1.lPitch = DDSD->u1.lPitch; - if (DDSD->dwFlags & DDSD_HEIGHT) - This->surface_desc.dwHeight = height; - if (DDSD->dwFlags & DDSD_PIXELFORMAT) - This->surface_desc.u4.ddpfPixelFormat = DDSD->u4.ddpfPixelFormat; + WARN("Failed to update surface desc, hr %#x.\n", hr); + wined3d_mutex_unlock(); + return hr; } + if (DDSD->dwFlags & DDSD_WIDTH) + This->surface_desc.dwWidth = width; + if (DDSD->dwFlags & DDSD_PITCH) + This->surface_desc.u1.lPitch = DDSD->u1.lPitch; + if (DDSD->dwFlags & DDSD_HEIGHT) + This->surface_desc.dwHeight = height; + if (DDSD->dwFlags & DDSD_PIXELFORMAT) + This->surface_desc.u4.ddpfPixelFormat = DDSD->u4.ddpfPixelFormat; + if (DDSD->dwFlags & DDSD_LPSURFACE && DDSD->lpSurface) { if (FAILED(hr = wined3d_surface_set_mem(This->wined3d_surface, DDSD->lpSurface, pitch)))

1 0

Stefan Dösinger : wined3d: Simplify wined3d_surface_set_mem.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 82666af87aaf51d2b8cf648b6d6c85154d45e346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82666af87aaf51d2b8cf648b6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 7 22:12:14 2014 +0100 wined3d: Simplify wined3d_surface_set_mem. --- dlls/wined3d/surface.c | 61 ++++++++++++++---------------------------------- 1 file changed, 18 insertions(+), 43 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7b96a21..9b9e245 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2619,54 +2619,29 @@ HRESULT CDECL wined3d_surface_set_mem(struct wined3d_surface *surface, void *mem return WINED3DERR_INVALIDCALL; } - if (mem && mem != surface->user_memory) + if (surface->flags & SFLAG_DIBSECTION) { - /* Do I have to copy the old surface content? */ - if (surface->flags & SFLAG_DIBSECTION) - { - DeleteDC(surface->hDC); - DeleteObject(surface->dib.DIBsection); - surface->dib.bitmap_data = NULL; - surface->resource.allocatedMemory = NULL; - surface->hDC = NULL; - surface->flags &= ~SFLAG_DIBSECTION; - } - else if (!(surface->flags & SFLAG_USERPTR)) - { - wined3d_resource_free_sysmem(&surface->resource); - surface->resource.allocatedMemory = NULL; - } - surface->user_memory = mem; - surface->flags |= SFLAG_USERPTR; - - /* Now the surface memory is most up do date. Invalidate drawable and texture. */ - surface_validate_location(surface, SFLAG_INSYSMEM); - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); - - /* For client textures OpenGL has to be notified. */ - if (surface->flags & SFLAG_CLIENT) - surface_release_client_storage(surface); + DeleteDC(surface->hDC); + DeleteObject(surface->dib.DIBsection); + surface->dib.bitmap_data = NULL; + surface->resource.allocatedMemory = NULL; + surface->hDC = NULL; + surface->flags &= ~SFLAG_DIBSECTION; } - else if (surface->flags & SFLAG_USERPTR) + else if (!(surface->flags & SFLAG_USERPTR)) { - /* heap_memory should be NULL already. */ - if (surface->resource.heap_memory) - ERR("User pointer surface has heap memory allocated.\n"); - - if (!mem) - { - surface->user_memory = NULL; - surface->flags &= ~(SFLAG_USERPTR | SFLAG_INSYSMEM); - - if (surface->flags & SFLAG_CLIENT) - surface_release_client_storage(surface); + wined3d_resource_free_sysmem(&surface->resource); + surface->resource.allocatedMemory = NULL; + } - surface_prepare_system_memory(surface); - } + surface->user_memory = mem; + surface->flags |= SFLAG_USERPTR; + surface_validate_location(surface, SFLAG_INSYSMEM); + surface_invalidate_location(surface, ~SFLAG_INSYSMEM); - surface_validate_location(surface, SFLAG_INSYSMEM); - surface_invalidate_location(surface, ~SFLAG_INSYSMEM); - } + /* For client textures OpenGL has to be notified. */ + if (surface->flags & SFLAG_CLIENT) + surface_release_client_storage(surface); surface->pitch = pitch;

1 0

Vincent Povirk : explorer: Add non-functional start button.
by Alexandre Julliard 08 Jan '14

08 Jan '14

1 0

Vincent Povirk : explorer: Add a start menu.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 058765f765c8697a4e90f21669e71b6532682ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=058765f765c8697a4e90f2166… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Dec 6 14:16:54 2013 -0600 explorer: Add a start menu. --- programs/explorer/Makefile.in | 1 + programs/explorer/explorer_private.h | 2 + programs/explorer/startmenu.c | 415 ++++++++++++++++++++++++++++++++++ programs/explorer/systray.c | 9 + 4 files changed, 427 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=058765f765c8697a4e90f…

1 0

André Hentschel : kernel32/tests: Don' t test last error on success.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 1c61a53ef66f65ea43bfb43e84112b981eec59bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c61a53ef66f65ea43bfb43e8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 8 01:53:52 2014 +0100 kernel32/tests: Don't test last error on success. --- dlls/kernel32/tests/console.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b38bb30..18d3cf9 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -1152,22 +1152,13 @@ static void test_OpenConsoleW(void) CloseHandle(ret); } - /* OpenConsoleW should not touch the last error on success. */ - SetLastError(0xdeadbeef); ret = pOpenConsoleW(coninW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_EXISTING); - ok(ret != INVALID_HANDLE_VALUE, - "Expected OpenConsoleW to return a valid handle\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected the last error to be untouched, got %u\n", GetLastError()); + ok(ret != INVALID_HANDLE_VALUE, "Expected OpenConsoleW to return a valid handle\n"); if (ret != INVALID_HANDLE_VALUE) CloseHandle(ret); - SetLastError(0xdeadbeef); ret = pOpenConsoleW(conoutW, GENERIC_READ | GENERIC_WRITE, FALSE, OPEN_EXISTING); - ok(ret != INVALID_HANDLE_VALUE, - "Expected OpenConsoleW to return a valid handle\n"); - ok(GetLastError() == 0xdeadbeef, - "Expected the last error to be untouched, got %u\n", GetLastError()); + ok(ret != INVALID_HANDLE_VALUE, "Expected OpenConsoleW to return a valid handle\n"); if (ret != INVALID_HANDLE_VALUE) CloseHandle(ret); }

1 0

Michael Stefaniuc : dmime: Fix copy and paste errors.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 8472190aaf874afc27ffe9e90965696e43981dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8472190aaf874afc27ffe9e90… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jan 8 09:24:54 2014 +0100 dmime: Fix copy and paste errors. --- dlls/dmime/segtriggertrack.c | 2 +- dlls/dmime/tempotrack.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 583561c..56847ae 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -235,7 +235,7 @@ static ULONG WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Release (LPPERSIS } static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); + ICOM_THIS_MULTI(IDirectMusicSegTriggerTrack, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); *pClassID = CLSID_DirectMusicSegTriggerTrack; return S_OK; diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index b8dee90..cf1b275 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -307,7 +307,7 @@ static ULONG WINAPI IDirectMusicTempoTrack_IPersistStream_Release (LPPERSISTSTRE } static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - ICOM_THIS_MULTI(IDirectMusicSegment8Impl, PersistStreamVtbl, iface); + ICOM_THIS_MULTI(IDirectMusicTempoTrack, PersistStreamVtbl, iface); TRACE("(%p, %p)\n", This, pClassID); *pClassID = CLSID_DirectMusicTempoTrack; return S_OK;

1 0