wine-commits December 2009

wine-commits@winehq.org

3 participants
1233 discussions

Rob Shearman : ws2_32: Initialise buffer eventually passed into send to zero in test_write_events .
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 0d10ddd4d54e5094d9fddce90b937a72a7b04078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d10ddd4d54e5094d9fddce90… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 1 13:14:06 2009 +0000 ws2_32: Initialise buffer eventually passed into send to zero in test_write_events. --- dlls/ws2_32/tests/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c17b894..fbe55f6 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2589,7 +2589,7 @@ static void test_write_events(void) goto end; } - buffer = HeapAlloc(GetProcessHeap(), 0, bufferSize); + buffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bufferSize); if (buffer == NULL) { ok(0, "could not allocate memory for test\n");

1 0

Rob Shearman : oleaut32: Remove LPVOID variables in olefont tests and pass IFont pointers into OleCreateFontIndirect directly .
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: f7624cbfbc868601719722d6aa94621af0f98f92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7624cbfbc868601719722d6a… Author: Rob Shearman <robertshearman(a)gmail.com> Date: Tue Dec 1 13:13:40 2009 +0000 oleaut32: Remove LPVOID variables in olefont tests and pass IFont pointers into OleCreateFontIndirect directly. In many places the assignment of the LPVOID variable into the corresponding IFont * variable has been forgotten. --- dlls/oleaut32/tests/olefont.c | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index b457f36..55e0e58 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -491,8 +491,6 @@ static void test_Invoke(void) static void test_IsEqual(void) { FONTDESC fd; - LPVOID pvObj = NULL; - LPVOID pvObj2 = NULL; IFont* ifnt = NULL; IFont* ifnt2 = NULL; HRESULT hres; @@ -509,12 +507,10 @@ static void test_IsEqual(void) fd.fStrikethrough = 0; /* Create font */ - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj); - ifnt = pvObj; + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt); /* Test equal fonts */ - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); - ifnt2 = pvObj2; + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_OK, "IFont_IsEqual: (EQUAL) Expected S_OK but got 0x%08x\n",hres); @@ -527,7 +523,7 @@ static void test_IsEqual(void) /* Test strName */ fd.lpstrName = arial_font; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (strName) Expected S_FALSE but got 0x%08x\n",hres); @@ -536,8 +532,7 @@ static void test_IsEqual(void) /* Test lo font size */ S(fd.cySize).Lo = 10000; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); - ifnt2 = pvObj2; + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Lo font size) Expected S_FALSE but got 0x%08x\n",hres); @@ -546,8 +541,7 @@ static void test_IsEqual(void) /* Test hi font size */ S(fd.cySize).Hi = 10000; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); - ifnt2 = pvObj2; + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Hi font size) Expected S_FALSE but got 0x%08x\n",hres); @@ -556,8 +550,7 @@ static void test_IsEqual(void) /* Test font weight */ fd.sWeight = 100; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); - ifnt2 = pvObj2; + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Weight) Expected S_FALSE but got 0x%08x\n",hres); @@ -566,7 +559,7 @@ static void test_IsEqual(void) /* Test charset */ fd.sCharset = 1; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Charset) Expected S_FALSE but got 0x%08x\n",hres); @@ -575,7 +568,7 @@ static void test_IsEqual(void) /* Test italic setting */ fd.fItalic = 1; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Italic) Expected S_FALSE but got 0x%08x\n",hres); @@ -584,7 +577,7 @@ static void test_IsEqual(void) /* Test underline setting */ fd.fUnderline = 1; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Underline) Expected S_FALSE but got 0x%08x\n",hres); @@ -593,7 +586,7 @@ static void test_IsEqual(void) /* Test strikethrough setting */ fd.fStrikethrough = 1; - pOleCreateFontIndirect(&fd, &IID_IFont, &pvObj2); + pOleCreateFontIndirect(&fd, &IID_IFont, (void **)&ifnt2); hres = IFont_IsEqual(ifnt,ifnt2); ok(hres == S_FALSE, "IFont_IsEqual: (Strikethrough) Expected S_FALSE but got 0x%08x\n",hres);

1 0

Maarten Lankhorst : ntdll: Silence a common warning.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 58c7aa46914b21c3bb2300e4bd9c0369bbf3685d URL: http://source.winehq.org/git/wine.git/?a=commit;h=58c7aa46914b21c3bb2300e4b… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Mon Nov 30 18:18:58 2009 +0100 ntdll: Silence a common warning. --- dlls/ntdll/directory.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index a09aab1..40cc455 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2412,7 +2412,7 @@ NTSTATUS CDECL wine_nt_to_unix_file_name( const UNICODE_STRING *nameW, ANSI_STRI if (status != STATUS_SUCCESS) { /* couldn't find it at all, fail */ - WARN( "%s not found in %s\n", debugstr_w(name), unix_name ); + TRACE( "%s not found in %s\n", debugstr_w(name), unix_name ); RtlFreeHeap( GetProcessHeap(), 0, unix_name ); return status; }

1 0

Alexandre Julliard : gdi32: Avoid calling get_dc_ptr on a null handle.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: cc973b0cdc9168dbcfdfd87d5e2b3d5d71b38fa1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc973b0cdc9168dbcfdfd87d5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 14:38:21 2009 +0100 gdi32: Avoid calling get_dc_ptr on a null handle. --- dlls/gdi32/dc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index c4c5a13..2aeeec2 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -750,8 +750,9 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) GDI_CheckNotLock(); - if ((origDC = get_dc_ptr( hdc ))) + if (hdc) { + if (!(origDC = get_dc_ptr( hdc ))) return 0; if (GetObjectType( hdc ) == OBJ_DC) { funcs = origDC->funcs; @@ -760,7 +761,6 @@ HDC WINAPI CreateCompatibleDC( HDC hdc ) release_dc_ptr( origDC ); if (funcs) funcs = DRIVER_get_driver( funcs ); } - else if (hdc) return 0; if (!funcs && !(funcs = DRIVER_load_driver( displayW ))) return 0;

1 0

Ilya Shpigor : comctl32: Test the WM_GETTEXT processing of datetime control .
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: e4e55ed8b4e2ff57a62927fb91f4d4244a0a3b39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4e55ed8b4e2ff57a62927fb9… Author: Ilya Shpigor <shpigor(a)etersoft.ru> Date: Mon Nov 30 15:24:27 2009 +0300 comctl32: Test the WM_GETTEXT processing of datetime control. --- dlls/comctl32/tests/datetime.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index 8a3ad03..9218e07 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -659,7 +659,7 @@ static void test_dtm_set_and_get_system_time(void) static void test_wm_set_get_text(void) { static const CHAR a_str[] = "a"; - char buff[10]; + char buff[16], time[16]; HWND hWnd; LRESULT ret; @@ -674,6 +674,10 @@ static void test_wm_set_get_text(void) ret = SendMessage(hWnd, WM_GETTEXT, sizeof(buff), (LPARAM)buff); ok(strcmp(buff, a_str) != 0, "Expected text not to change, got %s\n", buff); + GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL, time, sizeof(time)); + todo_wine + ok(!strcmp(buff, time), "Expected %s, got %s\n", time, buff); + DestroyWindow(hWnd); }

1 0

Alexandre Julliard : server: Make sure that last error doesn' t get set during thread cleanup.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: e4faa12900a8bc2be59cbb611b3cdf456942cbf0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4faa12900a8bc2be59cbb611… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 15:10:23 2009 +0100 server: Make sure that last error doesn't get set during thread cleanup. --- server/clipboard.c | 6 ++++-- server/hook.c | 5 +++-- server/process.c | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/server/clipboard.c b/server/clipboard.c index 065dd2d..0c39319 100644 --- a/server/clipboard.c +++ b/server/clipboard.c @@ -30,6 +30,7 @@ #define WIN32_NO_STATUS #include "request.h" #include "object.h" +#include "process.h" #include "user.h" #include "winuser.h" #include "winternl.h" @@ -112,9 +113,10 @@ static struct clipboard *get_process_clipboard(void) void cleanup_clipboard_thread(struct thread *thread) { struct clipboard *clipboard; - struct winstation *winstation = get_process_winstation( thread->process, WINSTA_ACCESSCLIPBOARD ); + struct winstation *winstation; - if (!winstation) return; + if (!thread->process->winstation) return; + if (!(winstation = get_process_winstation( thread->process, WINSTA_ACCESSCLIPBOARD ))) return; if ((clipboard = winstation->clipboard)) { diff --git a/server/hook.c b/server/hook.c index f5ebc2b..7b889d8 100644 --- a/server/hook.c +++ b/server/hook.c @@ -114,9 +114,10 @@ static struct hook_table *alloc_hook_table(void) static struct hook_table *get_global_hooks( struct thread *thread ) { struct hook_table *table; - struct desktop *desktop = get_thread_desktop( thread, 0 ); + struct desktop *desktop; - if (!desktop) return NULL; + if (!thread->desktop) return NULL; + if (!(desktop = get_thread_desktop( thread, 0 ))) return NULL; table = desktop->global_hooks; release_object( desktop ); return table; diff --git a/server/process.c b/server/process.c index 630abe6..51193b7 100644 --- a/server/process.c +++ b/server/process.c @@ -632,6 +632,8 @@ static void process_killed( struct process *process ) handles = process->handles; process->handles = NULL; if (handles) release_object( handles ); + process->winstation = 0; + process->desktop = 0; /* close the console attached to this process, if any */ free_console( process );

1 0

Alexandre Julliard : server: Don't set last error in close_handle(), return the error code instead.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 60efdd55eaf73bf556dc9ab97745780f911da3f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60efdd55eaf73bf556dc9ab97… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 13:59:41 2009 +0100 server: Don't set last error in close_handle(), return the error code instead. --- server/handle.c | 33 ++++++++------------------------- server/handle.h | 2 +- server/winstation.c | 5 ++--- 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/server/handle.c b/server/handle.c index d1b6a14..3baaa6d 100644 --- a/server/handle.c +++ b/server/handle.c @@ -347,35 +347,22 @@ struct handle_table *copy_handle_table( struct process *process, struct process } /* close a handle and decrement the refcount of the associated object */ -/* return 1 if OK, 0 on error */ -int close_handle( struct process *process, obj_handle_t handle ) +unsigned int close_handle( struct process *process, obj_handle_t handle ) { struct handle_table *table; struct handle_entry *entry; struct object *obj; - if (!(entry = get_handle( process, handle ))) - { - set_error( STATUS_INVALID_HANDLE ); - return 0; - } - if (entry->access & RESERVED_CLOSE_PROTECT) - { - set_error( STATUS_HANDLE_NOT_CLOSABLE ); - return 0; - } + if (!(entry = get_handle( process, handle ))) return STATUS_INVALID_HANDLE; + if (entry->access & RESERVED_CLOSE_PROTECT) return STATUS_HANDLE_NOT_CLOSABLE; obj = entry->ptr; - if (!obj->ops->close_handle( obj, process, handle )) - { - set_error( STATUS_HANDLE_NOT_CLOSABLE ); - return 0; - } + if (!obj->ops->close_handle( obj, process, handle )) return STATUS_HANDLE_NOT_CLOSABLE; entry->ptr = NULL; table = handle_is_global(handle) ? global_table : process->handles; if (entry < table->entries + table->free) table->free = entry - table->entries; if (entry == table->entries + table->last) shrink_handle_table( table ); release_object( obj ); - return 1; + return STATUS_SUCCESS; } /* retrieve the object corresponding to one of the magic pseudo-handles */ @@ -567,7 +554,8 @@ unsigned int get_handle_table_count( struct process *process ) /* close a handle */ DECL_HANDLER(close_handle) { - close_handle( current->process, req->handle ); + unsigned int err = close_handle( current->process, req->handle ); + set_error( err ); } /* set a handle information */ @@ -596,12 +584,7 @@ DECL_HANDLER(dup_handle) release_object( dst ); } /* close the handle no matter what happened */ - if (req->options & DUP_HANDLE_CLOSE_SOURCE) - { - unsigned int err = get_error(); /* don't overwrite error from the above calls */ - reply->closed = close_handle( src, req->src_handle ); - set_error( err ); - } + if (req->options & DUP_HANDLE_CLOSE_SOURCE) reply->closed = !close_handle( src, req->src_handle ); reply->self = (src == current->process); release_object( src ); } diff --git a/server/handle.h b/server/handle.h index 3809aa3..7860f52 100644 --- a/server/handle.h +++ b/server/handle.h @@ -38,7 +38,7 @@ extern obj_handle_t alloc_handle( struct process *process, void *obj, unsigned int access, unsigned int attr ); extern obj_handle_t alloc_handle_no_access_check( struct process *process, void *ptr, unsigned int access, unsigned int attr ); -extern int close_handle( struct process *process, obj_handle_t handle ); +extern unsigned int close_handle( struct process *process, obj_handle_t handle ); extern struct object *get_handle_obj( struct process *process, obj_handle_t handle, unsigned int access, const struct object_ops *ops ); extern unsigned int get_handle_access( struct process *process, obj_handle_t handle ); diff --git a/server/winstation.c b/server/winstation.c index cfff0a4..7ddc277 100644 --- a/server/winstation.c +++ b/server/winstation.c @@ -403,7 +403,6 @@ void close_thread_desktop( struct thread *thread ) thread->desktop = 0; if (handle) close_handle( thread->process, handle ); - clear_error(); /* ignore errors */ } /* set the reply data from the object name */ @@ -458,7 +457,7 @@ DECL_HANDLER(close_winstation) if ((winstation = (struct winstation *)get_handle_obj( current->process, req->handle, 0, &winstation_ops ))) { - if (!close_handle( current->process, req->handle )) set_error( STATUS_ACCESS_DENIED ); + if (close_handle( current->process, req->handle )) set_error( STATUS_ACCESS_DENIED ); release_object( winstation ); } } @@ -544,7 +543,7 @@ DECL_HANDLER(close_desktop) if ((desktop = (struct desktop *)get_handle_obj( current->process, req->handle, 0, &desktop_ops ))) { - if (!close_handle( current->process, req->handle )) set_error( STATUS_DEVICE_BUSY ); + if (close_handle( current->process, req->handle )) set_error( STATUS_DEVICE_BUSY ); release_object( desktop ); } }

1 0

Alexandre Julliard : server: Don't set last error in get_handle(), move that into the callers.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 1a6c4721157c38538a2badd0ab9fdc2ec38ff96e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a6c4721157c38538a2badd0a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 1 13:49:43 2009 +0100 server: Don't set last error in get_handle(), move that into the callers. --- server/handle.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/server/handle.c b/server/handle.c index 4f02154..d1b6a14 100644 --- a/server/handle.c +++ b/server/handle.c @@ -286,17 +286,13 @@ static struct handle_entry *get_handle( struct process *process, obj_handle_t ha handle = handle_global_to_local(handle); table = global_table; } - if (!table) goto error; + if (!table) return NULL; index = handle_to_index( handle ); - if (index < 0) goto error; - if (index > table->last) goto error; + if (index < 0) return NULL; + if (index > table->last) return NULL; entry = table->entries + index; - if (!entry->ptr) goto error; + if (!entry->ptr) return NULL; return entry; - - error: - set_error( STATUS_INVALID_HANDLE ); - return NULL; } /* attempt to shrink a table */ @@ -358,7 +354,11 @@ int close_handle( struct process *process, obj_handle_t handle ) struct handle_entry *entry; struct object *obj; - if (!(entry = get_handle( process, handle ))) return 0; + if (!(entry = get_handle( process, handle ))) + { + set_error( STATUS_INVALID_HANDLE ); + return 0; + } if (entry->access & RESERVED_CLOSE_PROTECT) { set_error( STATUS_HANDLE_NOT_CLOSABLE ); @@ -402,7 +402,11 @@ struct object *get_handle_obj( struct process *process, obj_handle_t handle, if (!(obj = get_magic_handle( handle ))) { - if (!(entry = get_handle( process, handle ))) return NULL; + if (!(entry = get_handle( process, handle ))) + { + set_error( STATUS_INVALID_HANDLE ); + return NULL; + } if ((entry->access & access) != access) { set_error( STATUS_ACCESS_DENIED ); @@ -481,7 +485,11 @@ static int set_handle_flags( struct process *process, obj_handle_t handle, int m if (mask) set_error( STATUS_ACCESS_DENIED ); return 0; } - if (!(entry = get_handle( process, handle ))) return -1; + if (!(entry = get_handle( process, handle ))) + { + set_error( STATUS_INVALID_HANDLE ); + return -1; + } old_access = entry->access; mask = (mask << RESERVED_SHIFT) & RESERVED_ALL; flags = (flags << RESERVED_SHIFT) & mask; @@ -502,10 +510,7 @@ obj_handle_t duplicate_handle( struct process *src, obj_handle_t src_handle, str if ((entry = get_handle( src, src_handle ))) src_access = entry->access; else /* pseudo-handle, give it full access */ - { src_access = obj->ops->map_access( obj, GENERIC_ALL ); - clear_error(); - } src_access &= ~RESERVED_ALL; if (options & DUP_HANDLE_SAME_ACCESS)

1 0

Austin Lund : shell32/tests: Fix ITEMIDLIST_format test when running on FAT filesystems.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: 487a51b52f90d7674930013b0f4a6b4ce775766d URL: http://source.winehq.org/git/wine.git/?a=commit;h=487a51b52f90d7674930013b0… Author: Austin Lund <austin.lund(a)gmail.com> Date: Sat Nov 21 09:02:32 2009 +1000 shell32/tests: Fix ITEMIDLIST_format test when running on FAT filesystems. --- dlls/shell32/tests/shlfolder.c | 23 ++++++++++++++++++++--- 1 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 831205a..caae425 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1525,9 +1525,26 @@ static void test_ITEMIDLIST_format(void) { pFileStructA->uFileTime == pFileStructW->uTime, "Last write time should match creation time!\n"); - ok (pFileStructA->uFileDate == pFileStructW->uDate2 && - pFileStructA->uFileTime == pFileStructW->uTime2, - "Last write time should match last access time!\n"); + /* On FAT filesystems the last access time is midnight + local time, so the values of uDate2 and uTime2 will + depend on the local timezone. If the times are exactly + equal then the dates should be identical for both FAT + and NTFS as no timezone is more than 1 day away from UTC. + */ + if (pFileStructA->uFileTime == pFileStructW->uTime2) + { + ok (pFileStructA->uFileDate == pFileStructW->uDate2, + "Last write date and time should match last access date and time!\n"); + } + else + { + /* Filesystem may be FAT. Check date within 1 day + and seconds are zero. */ + trace ("Filesystem may be FAT. Performing less strict atime test.\n"); + ok ((pFileStructW->uTime2 & 0x1F) == 0, + "Last access time on FAT filesystems should have zero seconds.\n"); + /* TODO: Perform check for date being within one day.*/ + } ok (!lstrcmpW(wszFile[i], pFileStructW->wszName) || !lstrcmpW(wszFile[i], (WCHAR *)(pFileStructW->abFooBar2 + 22)) || /* Vista */

1 0

Hans Leidekker : advapi32: Improve the stub for GetEffectiveRightsFromAclA.
by Alexandre Julliard 01 Dec '09

01 Dec '09

Module: wine Branch: master Commit: c0d79c475b9bf815317a1ce69b9821be88c51d75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0d79c475b9bf815317a1ce69… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 1 11:35:50 2009 +0100 advapi32: Improve the stub for GetEffectiveRightsFromAclA. --- dlls/advapi32/security.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 3e79a61..629a74a 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1100,7 +1100,8 @@ GetEffectiveRightsFromAclA( PACL pacl, PTRUSTEEA pTrustee, PACCESS_MASK pAccessR { FIXME("%p %p %p - stub\n", pacl, pTrustee, pAccessRights); - return 1; + *pAccessRights = STANDARD_RIGHTS_ALL | SPECIFIC_RIGHTS_ALL; + return 0; } DWORD WINAPI

1 0

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 December 2009