April 2015 - Wine-Commits - list.winehq.org

Aaryaman Vasishta : d3drm: Move AddRef from frame2->frame3.
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: 1e3737f15266970e4d67ab7761e786e412e3e166 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e3737f15266970e4d67ab776… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Apr 26 17:07:00 2015 +0530 d3drm: Move AddRef from frame2->frame3. --- dlls/d3drm/frame.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 6737cc4..22daec4 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -476,11 +476,10 @@ static HRESULT WINAPI d3drm_frame2_QueryInterface(IDirect3DRMFrame2 *iface, REFI static ULONG WINAPI d3drm_frame2_AddRef(IDirect3DRMFrame2 *iface) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - ULONG refcount = InterlockedIncrement(&frame->ref); - TRACE("%p increasing refcount to %u.\n", iface, refcount); + TRACE("iface %p.\n", iface); - return refcount; + return IDirect3DRMFrame3_AddRef(&frame->IDirect3DRMFrame3_iface); } static ULONG WINAPI d3drm_frame2_Release(IDirect3DRMFrame2 *iface) @@ -1239,10 +1238,11 @@ static HRESULT WINAPI d3drm_frame3_QueryInterface(IDirect3DRMFrame3 *iface, REFI static ULONG WINAPI d3drm_frame3_AddRef(IDirect3DRMFrame3 *iface) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); + ULONG refcount = InterlockedIncrement(&frame->ref); - TRACE("iface %p.\n", iface); + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return d3drm_frame2_AddRef(&frame->IDirect3DRMFrame2_iface); + return refcount; } static ULONG WINAPI d3drm_frame3_Release(IDirect3DRMFrame3 *iface)

1 0

Nikolay Sivov : shell32: Update to IShellView3.
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: 5d288771c9962245346ca94f5d9dad48741e06c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d288771c9962245346ca94f5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 29 20:53:39 2015 +0300 shell32: Update to IShellView3. --- dlls/shell32/shlview.c | 407 +++++++++++++++++++++---------------------------- include/shobjidl.idl | 29 ++++ 2 files changed, 204 insertions(+), 232 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5d288771c9962245346ca…

1 0

Sebastian Lackner : wine.inf: Add timezone information for Asia/{Dhaka, Magadan, Karachi, Damascus, Ulaanbaatar}.
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: b14b646ef62acf82ba9d415829bf85c128b0278b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b14b646ef62acf82ba9d41582… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 29 19:17:35 2015 +0200 wine.inf: Add timezone information for Asia/{Dhaka, Magadan, Karachi, Damascus, Ulaanbaatar}. --- loader/wine.inf.in | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index b1acabe..31924ac 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2644,6 +2644,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"Display",,"America/Bahia HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"Dlt",,"Bahia Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"Std",,"Bahia Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Bahia Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"Display",,"Asia/Dhaka" +HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"Dlt",,"Bangladesh Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"Std",,"Bangladesh Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Bangladesh Standard Time,"TZI",1,98,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Display",,"Europe/Minsk" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Dlt",,"Belarus Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Belarus Standard Time,"Std",,"Belarus Standard Time" @@ -2875,6 +2879,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Display",,"Asia/Seoul" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Dlt",,"Korea Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Std",,"Korea Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Display",,"Asia/Magadan" +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Dlt",,"Magadan Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Std",,"Magadan Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time,"Display",,"America/Mexico_City" HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time,"Dlt",,"Mexico Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time,"Std",,"Mexico Standard Time" @@ -2947,6 +2955,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Display",,"Am HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Dlt",,"Pacific Daylight Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"Std",,"Pacific Standard Time (Mexico)" HKLM,%CurrentVersionNT%\Time Zones\Pacific Standard Time (Mexico),"TZI",1,e0,01,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0b,00,00,00,01,00,02,00,00,00,00,00,00,00,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"Display",,"Asia/Karachi" +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"Dlt",,"Pakistan Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"Std",,"Pakistan Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Pakistan Standard Time,"TZI",1,d4,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"Display",,"America/Asuncion" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"Dlt",,"Paraguay Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Paraguay Standard Time,"Std",,"Paraguay Standard Time" @@ -2991,6 +3003,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"Display",,"Asia/Colo HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"Dlt",,"Sri Lanka Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"Std",,"Sri Lanka Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Sri Lanka Standard Time,"TZI",1,b6,fe,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"Display",,"Asia/Damascus" +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"Dlt",,"Syria Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"Std",,"Syria Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Syria Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,05,00,05,00,00,00,00,00,00,00,00,00,00,00,03,00,05,00,05,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"Display",,"Asia/Taipei" HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"Dlt",,"Taipei Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Taipei Standard Time,"Std",,"Taipei Standard Time" @@ -3007,6 +3023,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"Display",,"Pacific/Tonga HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"Dlt",,"Tonga Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"Std",,"Tonga Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Tonga Standard Time,"TZI",1,f4,fc,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Display",,"Asia/Ulaanbaatar" +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Dlt",,"Ulaanbaatar Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"Std",,"Ulaanbaatar Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Ulaanbaatar Standard Time,"TZI",1,20,fe,ff,ff,00,00,00,00,c4,ff,ff,ff,00,00,09,00,06,00,05,00,00,00,00,00,00,00,00,00,00,00,03,00,06,00,05,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"Display",,"America/Indianapolis" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"Dlt",,"US Eastern Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\US Eastern Standard Time,"Std",,"US Eastern Standard Time"

1 0

Matteo Bruni : wined3d: Don' t use the same va_list multiple times in shader_vaddline().
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: f7e09276227e23a17626b292279326e51b2b2708 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7e09276227e23a17626b2922… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Apr 29 23:34:28 2015 +0200 wined3d: Don't use the same va_list multiple times in shader_vaddline(). --- dlls/wined3d/glsl_shader.c | 14 ++++++-- dlls/wined3d/shader.c | 79 ++++++++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 58 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e814c66..19c3d31 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2762,6 +2762,7 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s struct color_fixup_desc fixup; BOOL np2_fixup = FALSE; va_list args; + int ret; shader_glsl_swizzle_to_str(swizzle, FALSE, ins->dst[0].write_mask, dst_swizzle); @@ -2791,9 +2792,16 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s shader_addline(ins->ctx->buffer, "%s(%s_sampler%u, ", sample_function->name, shader_glsl_get_prefix(version->type), sampler); - va_start(args, coord_reg_fmt); - shader_vaddline(ins->ctx->buffer, coord_reg_fmt, args); - va_end(args); + for (;;) + { + va_start(args, coord_reg_fmt); + ret = shader_vaddline(ins->ctx->buffer, coord_reg_fmt, args); + va_end(args); + if (!ret) + break; + if (!string_buffer_resize(ins->ctx->buffer, ret)) + break; + } if(bias) { shader_addline(ins->ctx->buffer, ", %s)%s);\n", bias, dst_swizzle); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 87a22c2..279ec42 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -269,35 +269,35 @@ void string_buffer_free(struct wined3d_string_buffer *buffer) HeapFree(GetProcessHeap(), 0, buffer->buffer); } -int shader_vaddline(struct wined3d_string_buffer *buffer, const char *format, va_list args) +BOOL string_buffer_resize(struct wined3d_string_buffer *buffer, int rc) { - unsigned int rem; - int rc; char *new_buffer; - unsigned int new_buffer_size; + unsigned int new_buffer_size = buffer->buffer_size * 2; - for (;;) + while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) + new_buffer_size *= 2; + if (!(new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, new_buffer_size))) { - rem = buffer->buffer_size - buffer->content_size; - rc = vsnprintf(&buffer->buffer[buffer->content_size], rem, format, args); + ERR("Failed to grow buffer.\n"); + buffer->buffer[buffer->content_size] = '\0'; + return FALSE; + } + buffer->buffer = new_buffer; + buffer->buffer_size = new_buffer_size; + return TRUE; +} - if (rc >= 0 /* C89 */ && (unsigned int)rc < rem /* C99 */) - break; +int shader_vaddline(struct wined3d_string_buffer *buffer, const char *format, va_list args) +{ + unsigned int rem; + int rc; - new_buffer_size = buffer->buffer_size * 2; - while (rc > 0 && (unsigned int)rc >= new_buffer_size - buffer->content_size) - new_buffer_size *= 2; - if (!(new_buffer = HeapReAlloc(GetProcessHeap(), 0, buffer->buffer, new_buffer_size))) - { - ERR("Failed to grow buffer.\n"); - buffer->buffer[buffer->content_size] = '\0'; - return -1; - } - buffer->buffer = new_buffer; - buffer->buffer_size = new_buffer_size; - } - buffer->content_size += rc; + rem = buffer->buffer_size - buffer->content_size; + rc = vsnprintf(&buffer->buffer[buffer->content_size], rem, format, args); + if (rc < 0 /* C89 */ || (unsigned int)rc >= rem /* C99 */) + return rc; + buffer->content_size += rc; return 0; } @@ -306,11 +306,16 @@ int shader_addline(struct wined3d_string_buffer *buffer, const char *format, ... va_list args; int ret; - va_start(args, format); - ret = shader_vaddline(buffer, format, args); - va_end(args); - - return ret; + for (;;) + { + va_start(args, format); + ret = shader_vaddline(buffer, format, args); + va_end(args); + if (!ret) + return ret; + if (!string_buffer_resize(buffer, ret)) + return -1; + } } struct wined3d_string_buffer *string_buffer_get(struct wined3d_string_buffer_list *list) @@ -337,21 +342,29 @@ struct wined3d_string_buffer *string_buffer_get(struct wined3d_string_buffer_lis return buffer; } -static void string_buffer_vsprintf(struct wined3d_string_buffer *buffer, const char *format, va_list args) +static int string_buffer_vsprintf(struct wined3d_string_buffer *buffer, const char *format, va_list args) { if (!buffer) - return; + return 0; string_buffer_clear(buffer); - shader_vaddline(buffer, format, args); + return shader_vaddline(buffer, format, args); } void string_buffer_sprintf(struct wined3d_string_buffer *buffer, const char *format, ...) { va_list args; + int ret; - va_start(args, format); - string_buffer_vsprintf(buffer, format, args); - va_end(args); + for (;;) + { + va_start(args, format); + ret = string_buffer_vsprintf(buffer, format, args); + va_end(args); + if (!ret) + return; + if (!string_buffer_resize(buffer, ret)) + return; + } } void string_buffer_release(struct wined3d_string_buffer_list *list, struct wined3d_string_buffer *buffer) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 459c55a..fafdb20 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2896,6 +2896,7 @@ void string_buffer_list_init(struct wined3d_string_buffer_list *list) DECLSPEC_H void string_buffer_list_cleanup(struct wined3d_string_buffer_list *list) DECLSPEC_HIDDEN; int shader_addline(struct wined3d_string_buffer *buffer, const char *fmt, ...) PRINTF_ATTR(2,3) DECLSPEC_HIDDEN; +BOOL string_buffer_resize(struct wined3d_string_buffer *buffer, int rc) DECLSPEC_HIDDEN; int shader_vaddline(struct wined3d_string_buffer *buffer, const char *fmt, va_list args) DECLSPEC_HIDDEN; /* Vertex shader utility functions */

1 0

Sebastian Lackner : kernel32/tests: Add tests for deleting readonly files with NtCreateFile.
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: 10ee3f44b1119c7b7e1d4684e691a6cea5713ea2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10ee3f44b1119c7b7e1d4684e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 17 11:22:51 2015 +0200 kernel32/tests: Add tests for deleting readonly files with NtCreateFile. Wine currently implements DeleteFile based on NtCreateFile with access mask GENERIC_READ | GENERIC_WRITE | DELETE, but this is wrong. This test shows that NtCreateFile with FILE_DELETE_ON_CLOSE should also fail without explicitly requesting read/write access. --- dlls/kernel32/tests/file.c | 77 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 99fffab..9a6e972 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -28,10 +28,13 @@ #include <time.h> #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "wine/test.h" #include "windef.h" #include "winbase.h" #include "winerror.h" +#include "winternl.h" #include "winnls.h" #include "fileapi.h" @@ -48,6 +51,10 @@ static HRESULT (WINAPI *pCopyFile2)(PCWSTR,PCWSTR,COPYFILE2_EXTENDED_PARAMETERS* static HANDLE (WINAPI *pCreateFile2)(LPCWSTR, DWORD, DWORD, DWORD, CREATEFILE2_EXTENDED_PARAMETERS*); static DWORD (WINAPI *pGetFinalPathNameByHandleA)(HANDLE, LPSTR, DWORD, DWORD); static DWORD (WINAPI *pGetFinalPathNameByHandleW)(HANDLE, LPWSTR, DWORD, DWORD); +static NTSTATUS (WINAPI *pNtCreateFile)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, PIO_STATUS_BLOCK, + PLARGE_INTEGER, ULONG, ULONG, ULONG, ULONG, PVOID, ULONG); +static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR, PUNICODE_STRING, PWSTR*, CURDIR*); +static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING, PCANSI_STRING, BOOLEAN); static const char filename[] = "testfile.xxx"; static const char sillytext[] = @@ -72,8 +79,13 @@ struct test_list { static void InitFunctionPointers(void) { + HMODULE hntdll = GetModuleHandleA("ntdll"); HMODULE hkernel32 = GetModuleHandleA("kernel32"); + pNtCreateFile = (void *)GetProcAddress(hntdll, "NtCreateFile"); + pRtlDosPathNameToNtPathName_U = (void *)GetProcAddress(hntdll, "RtlDosPathNameToNtPathName_U"); + pRtlAnsiStringToUnicodeString = (void *)GetProcAddress(hntdll, "RtlAnsiStringToUnicodeString"); + pFindFirstFileExA=(void*)GetProcAddress(hkernel32, "FindFirstFileExA"); pReplaceFileA=(void*)GetProcAddress(hkernel32, "ReplaceFileA"); pReplaceFileW=(void*)GetProcAddress(hkernel32, "ReplaceFileW"); @@ -243,15 +255,36 @@ static void test__lclose( void ) ok( ret != 0, "DeleteFile failed (%d)\n", GetLastError( ) ); } +/* helper function for test__lcreat */ +static void get_nt_pathW( const char *name, UNICODE_STRING *nameW ) +{ + UNICODE_STRING strW; + ANSI_STRING str; + NTSTATUS status; + BOOLEAN ret; + RtlInitAnsiString( &str, name ); + + status = pRtlAnsiStringToUnicodeString( &strW, &str, TRUE ); + ok( !status, "RtlAnsiStringToUnicodeString failed with %08x\n", status ); + + ret = pRtlDosPathNameToNtPathName_U( strW.Buffer, nameW, NULL, NULL ); + ok( ret, "RtlDosPathNameToNtPathName_U failed\n" ); + + RtlFreeUnicodeString( &strW ); +} static void test__lcreat( void ) { + UNICODE_STRING filenameW; + OBJECT_ATTRIBUTES attr; + IO_STATUS_BLOCK io; HFILE filehandle; char buffer[10000]; WIN32_FIND_DATAA search_results; char slashname[] = "testfi/"; int err; - HANDLE find; + HANDLE find, file; + NTSTATUS status; BOOL ret; filehandle = _lcreat( filename, 0 ); @@ -287,12 +320,54 @@ static void test__lcreat( void ) ok( INVALID_HANDLE_VALUE != find, "should be able to find file\n" ); FindClose( find ); + SetLastError( 0xdeadbeef ); ok( 0 == DeleteFileA( filename ), "shouldn't be able to delete a readonly file\n" ); + ok( GetLastError() == ERROR_ACCESS_DENIED, "expected ERROR_ACCESS_DENIED, got %d\n", GetLastError() ); ok( SetFileAttributesA(filename, FILE_ATTRIBUTE_NORMAL ) != 0, "couldn't change attributes on file\n" ); ok( DeleteFileA( filename ) != 0, "now it should be possible to delete the file!\n" ); + filehandle = _lcreat( filename, 1 ); /* readonly */ + ok( HFILE_ERROR != filehandle, "couldn't create file \"%s\" (err=%d)\n", filename, GetLastError() ); + ok( HFILE_ERROR != _hwrite( filehandle, sillytext, strlen(sillytext) ), + "_hwrite shouldn't be able to write never the less\n" ); + ok( HFILE_ERROR != _lclose(filehandle), "_lclose complains\n" ); + + find = FindFirstFileA( filename, &search_results ); + ok( INVALID_HANDLE_VALUE != find, "should be able to find file\n" ); + FindClose( find ); + + get_nt_pathW( filename, &filenameW ); + attr.Length = sizeof(attr); + attr.RootDirectory = 0; + attr.Attributes = OBJ_CASE_INSENSITIVE; + attr.ObjectName = &filenameW; + attr.SecurityDescriptor = NULL; + attr.SecurityQualityOfService = NULL; + + status = NtCreateFile( &file, GENERIC_READ | GENERIC_WRITE | DELETE, &attr, &io, NULL, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0 ); + ok( status == STATUS_ACCESS_DENIED, "expected STATUS_ACCESS_DENIED, got %08x\n", status ); + ok( GetFileAttributesA( filename ) != INVALID_FILE_ATTRIBUTES, "file was deleted\n" ); + + status = NtCreateFile( &file, DELETE, &attr, &io, NULL, 0, + FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, + FILE_OPEN, FILE_DELETE_ON_CLOSE | FILE_NON_DIRECTORY_FILE, NULL, 0 ); + todo_wine + ok( status == STATUS_CANNOT_DELETE, "expected STATUS_CANNOT_DELETE, got %08x\n", status ); + if (!status) CloseHandle( file ); + + RtlFreeUnicodeString( &filenameW ); + + todo_wine + ok( GetFileAttributesA( filename ) != INVALID_FILE_ATTRIBUTES, "file was deleted\n" ); + todo_wine + ok( SetFileAttributesA(filename, FILE_ATTRIBUTE_NORMAL ) != 0, "couldn't change attributes on file\n" ); + todo_wine + ok( DeleteFileA( filename ) != 0, "now it should be possible to delete the file\n" ); + filehandle = _lcreat( filename, 2 ); ok( HFILE_ERROR != filehandle, "couldn't create file \"%s\" (err=%d)\n", filename, GetLastError( ) );

1 0

Aaryaman Vasishta : d3drm: Move Release from frame2->frame3.
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: dbee90a728a9c2a8bf3009f2a81c4b3d7f5b9eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbee90a728a9c2a8bf3009f2a… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Apr 26 17:07:01 2015 +0530 d3drm: Move Release from frame2->frame3. --- dlls/d3drm/frame.c | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 22daec4..4f9d952 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -485,32 +485,10 @@ static ULONG WINAPI d3drm_frame2_AddRef(IDirect3DRMFrame2 *iface) static ULONG WINAPI d3drm_frame2_Release(IDirect3DRMFrame2 *iface) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame2(iface); - ULONG refcount = InterlockedDecrement(&frame->ref); - ULONG i; - - TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (!refcount) - { - for (i = 0; i < frame->nb_children; ++i) - { - IDirect3DRMFrame3_Release(frame->children[i]); - } - HeapFree(GetProcessHeap(), 0, frame->children); - for (i = 0; i < frame->nb_visuals; ++i) - { - IDirect3DRMVisual_Release(frame->visuals[i]); - } - HeapFree(GetProcessHeap(), 0, frame->visuals); - for (i = 0; i < frame->nb_lights; ++i) - { - IDirect3DRMLight_Release(frame->lights[i]); - } - HeapFree(GetProcessHeap(), 0, frame->lights); - HeapFree(GetProcessHeap(), 0, frame); - } + TRACE("iface %p.\n", iface); - return refcount; + return IDirect3DRMFrame3_Release(&frame->IDirect3DRMFrame3_iface); } static HRESULT WINAPI d3drm_frame2_Clone(IDirect3DRMFrame2 *iface, @@ -1248,10 +1226,32 @@ static ULONG WINAPI d3drm_frame3_AddRef(IDirect3DRMFrame3 *iface) static ULONG WINAPI d3drm_frame3_Release(IDirect3DRMFrame3 *iface) { struct d3drm_frame *frame = impl_from_IDirect3DRMFrame3(iface); + ULONG refcount = InterlockedDecrement(&frame->ref); + ULONG i; - TRACE("iface %p.\n", iface); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - return d3drm_frame2_Release(&frame->IDirect3DRMFrame2_iface); + if (!refcount) + { + for (i = 0; i < frame->nb_children; ++i) + { + IDirect3DRMFrame3_Release(frame->children[i]); + } + HeapFree(GetProcessHeap(), 0, frame->children); + for (i = 0; i < frame->nb_visuals; ++i) + { + IDirect3DRMVisual_Release(frame->visuals[i]); + } + HeapFree(GetProcessHeap(), 0, frame->visuals); + for (i = 0; i < frame->nb_lights; ++i) + { + IDirect3DRMLight_Release(frame->lights[i]); + } + HeapFree(GetProcessHeap(), 0, frame->lights); + HeapFree(GetProcessHeap(), 0, frame); + } + + return refcount; } static HRESULT WINAPI d3drm_frame3_Clone(IDirect3DRMFrame3 *iface,

1 0

Aaryaman Vasishta : d3drm: Move QueryInterface from frame2->frame3.
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: b8b7a72f26d731498a22c05c79b81d25b8d58108 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b7a72f26d731498a22c05c7… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Apr 26 17:06:59 2015 +0530 d3drm: Move QueryInterface from frame2->frame3. --- dlls/d3drm/frame.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 39c2e7b..6737cc4 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -470,27 +470,7 @@ static HRESULT WINAPI d3drm_frame2_QueryInterface(IDirect3DRMFrame2 *iface, REFI TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - if (IsEqualGUID(riid, &IID_IDirect3DRMFrame2) - || IsEqualGUID(riid, &IID_IDirect3DRMFrame) - || IsEqualGUID(riid, &IID_IDirect3DRMObject) - || IsEqualGUID(riid, &IID_IDirect3DRMVisual) - || IsEqualGUID(riid, &IID_IUnknown)) - { - *out = &frame->IDirect3DRMFrame2_iface; - } - else if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3)) - { - *out = &frame->IDirect3DRMFrame3_iface; - } - else - { - *out = NULL; - WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); - return CLASS_E_CLASSNOTAVAILABLE; - } - - IUnknown_AddRef((IUnknown *)*out); - return S_OK; + return IDirect3DRMFrame3_QueryInterface(&frame->IDirect3DRMFrame3_iface, riid, out); } static ULONG WINAPI d3drm_frame2_AddRef(IDirect3DRMFrame2 *iface) @@ -1233,7 +1213,27 @@ static HRESULT WINAPI d3drm_frame3_QueryInterface(IDirect3DRMFrame3 *iface, REFI TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - return d3drm_frame2_QueryInterface(&frame->IDirect3DRMFrame2_iface, riid, out); + if (IsEqualGUID(riid, &IID_IDirect3DRMFrame2) + || IsEqualGUID(riid, &IID_IDirect3DRMFrame) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) + || IsEqualGUID(riid, &IID_IDirect3DRMVisual) + || IsEqualGUID(riid, &IID_IUnknown)) + { + *out = &frame->IDirect3DRMFrame2_iface; + } + else if (IsEqualGUID(riid, &IID_IDirect3DRMFrame3)) + { + *out = &frame->IDirect3DRMFrame3_iface; + } + else + { + *out = NULL; + WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; + } + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static ULONG WINAPI d3drm_frame3_AddRef(IDirect3DRMFrame3 *iface)

1 0

Nikolay Sivov : shell32: Added a stub implementation of IShellFolderViewDual3.
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: dd9813b5f7a859854851e7f9d0d3ecbfaebe0e9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd9813b5f7a859854851e7f9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 29 20:15:06 2015 +0300 shell32: Added a stub implementation of IShellFolderViewDual3. --- dlls/shell32/shlview.c | 263 +++++++++++++++++++++++++++++++++++++ dlls/shell32/tests/shelldispatch.c | 55 +++++++- dlls/shell32/tests/shlview.c | 2 +- 3 files changed, 315 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd9813b5f7a859854851e…

1 0

Sebastian Lackner : wine.inf: Add timezone information for Africa/{Tripoli , Casablanca}.
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: d4f1d73f035790b9d4c7c2f5c04f875984da464a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4f1d73f035790b9d4c7c2f5c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 29 19:32:58 2015 +0200 wine.inf: Add timezone information for Africa/{Tripoli, Casablanca}. --- loader/wine.inf.in | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 08e8ebd..fef18c5 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2883,6 +2883,10 @@ HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Display",,"Asia/Seoul" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Dlt",,"Korea Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"Std",,"Korea Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Korea Standard Time,"TZI",1,e4,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"Display",,"Africa/Tripoli" +HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"Dlt",,"Libya Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"Std",,"Libya Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Display",,"Asia/Magadan" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Dlt",,"Magadan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Std",,"Magadan Standard Time" @@ -2907,6 +2911,18 @@ HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"Display",,"America/ HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"Dlt",,"Montevideo Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"Std",,"Montevideo Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Montevideo Standard Time,"TZI",1,b4,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,03,00,00,00,02,00,02,00,00,00,00,00,00,00,00,00,0a,00,00,00,01,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Display",,"Africa/Casablanca" +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Dlt",,"Morocco Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"Std",,"Morocco Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time,"TZI",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,00,00,0a,00,00,00,05,00,03,00,00,00,00,00,00,00,00,00,03,00,00,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2015",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,df,07,0a,00,00,00,19,00,03,00,00,00,00,00,00,00,df,07,07,00,06,00,12,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2016",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e0,07,0a,00,00,00,1e,00,03,00,00,00,00,00,00,00,e0,07,07,00,06,00,09,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2022",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e6,07,0a,00,00,00,1e,00,03,00,00,00,00,00,00,00,e6,07,05,00,06,00,07,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2023",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e7,07,0a,00,00,00,1d,00,03,00,00,00,00,00,00,00,e7,07,04,00,06,00,16,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2024",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e8,07,0a,00,00,00,1b,00,03,00,00,00,00,00,00,00,e8,07,04,00,06,00,0d,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2025",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,e9,07,0a,00,00,00,1a,00,03,00,00,00,00,00,00,00,e9,07,04,00,06,00,05,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2035",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,f3,07,0a,00,06,00,1b,00,03,00,00,00,00,00,00,00,f3,07,03,00,00,00,19,00,02,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Morocco Standard Time\Dynamic DST,"2036",1,00,00,00,00,00,00,00,00,c4,ff,ff,ff,f4,07,0a,00,06,00,12,00,03,00,00,00,00,00,00,00,f4,07,03,00,00,00,1e,00,02,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Display",,"America/Denver" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Dlt",,"Mountain Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Mountain Standard Time,"Std",,"Mountain Standard Time"

1 0

Sebastian Lackner : wine.inf: Add timezone information for Pacific/ Kiritimati and Indian/Mauritius.
by Alexandre Julliard April 30, 2015

April 30, 2015

Module: wine Branch: master Commit: c4f4edcfcce6cbbfdb0c5b966969c5fcd56b2270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4f4edcfcce6cbbfdb0c5b966… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Wed Apr 29 19:44:33 2015 +0200 wine.inf: Add timezone information for Pacific/Kiritimati and Indian/Mauritius. --- loader/wine.inf.in | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index fef18c5..fcd2e49 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2887,10 +2887,18 @@ HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"Display",,"Africa/Tripol HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"Dlt",,"Libya Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"Std",,"Libya Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Libya Standard Time,"TZI",1,88,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"Display",,"Pacific/Kiritimati" +HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"Dlt",,"Line Islands Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"Std",,"Line Islands Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Line Islands Standard Time,"TZI",1,b8,fc,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Display",,"Asia/Magadan" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Dlt",,"Magadan Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"Std",,"Magadan Standard Time" HKLM,%CurrentVersionNT%\Time Zones\Magadan Standard Time,"TZI",1,a8,fd,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"Display",,"Indian/Mauritius" +HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"Dlt",,"Mauritius Daylight Time" +HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"Std",,"Mauritius Standard Time" +HKLM,%CurrentVersionNT%\Time Zones\Mauritius Standard Time,"TZI",1,10,ff,ff,ff,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time,"Display",,"America/Mexico_City" HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time,"Dlt",,"Mexico Daylight Time" HKLM,%CurrentVersionNT%\Time Zones\Mexico Standard Time,"Std",,"Mexico Standard Time"

1 0