January 2006 - Wine-commits

Rein Klazes : user: Fix SPI_{G|S}ETFONTSMOOTHING with tests.
by Alexandre Julliard 27 Jan '06

27 Jan '06

Module: wine Branch: refs/heads/master Commit: d4c62162e94bfac42652cd8020b91b3733742a38 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d4c62162e94bfac42652cd8… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Fri Jan 27 19:19:19 2006 +0100 user: Fix SPI_{G|S}ETFONTSMOOTHING with tests. --- dlls/user/sysparams.c | 8 +++++-- dlls/user/tests/sysparams.c | 49 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 49 insertions(+), 8 deletions(-) diff --git a/dlls/user/sysparams.c b/dlls/user/sysparams.c index 900a499..d678f43 100644 --- a/dlls/user/sysparams.c +++ b/dlls/user/sysparams.c @@ -1898,13 +1898,17 @@ BOOL WINAPI SystemParametersInfoW( UINT WINE_SPI_WARN(SPI_SETANIMATION); /* 73 WINVER >= 0x400 */ case SPI_GETFONTSMOOTHING: + { + UINT tmpval; ret = get_uint_param( SPI_SETFONTSMOOTHING_IDX, SPI_SETFONTSMOOTHING_REGKEY, SPI_SETFONTSMOOTHING_VALNAME, - &font_smoothing, pvParam ); + &font_smoothing, &tmpval ); + *(UINT *) pvParam = ( tmpval != 0); break; - + } case SPI_SETFONTSMOOTHING: + uiParam = uiParam ? 2 : 0; /* Win NT4/2k/XP behavior */ ret = set_uint_param( SPI_SETFONTSMOOTHING_IDX, SPI_SETFONTSMOOTHING_REGKEY, SPI_SETFONTSMOOTHING_VALNAME, diff --git a/dlls/user/tests/sysparams.c b/dlls/user/tests/sysparams.c index ac7c907..4b73230 100644 --- a/dlls/user/tests/sysparams.c +++ b/dlls/user/tests/sysparams.c @@ -39,6 +39,7 @@ static int strict; static int dpi; +static int iswin9x; static HDC hdc; #define eq(received, expected, label, type) \ @@ -118,6 +119,8 @@ static HDC hdc; #define SPI_SETSCREENREADER_VALNAME "On" #define SPI_SETSCREENREADER_REGKEY_LEGACY "Control Panel\\Accessibility" #define SPI_SETSCREENREADER_VALNAME_LEGACY "Blind Access" +#define SPI_SETFONTSMOOTHING_REGKEY "Control Panel\\Desktop" +#define SPI_SETFONTSMOOTHING_VALNAME "FontSmoothing" #define SPI_SETLOWPOWERACTIVE_REGKEY "Control Panel\\Desktop" #define SPI_SETLOWPOWERACTIVE_VALNAME "LowPowerActive" #define SPI_SETPOWEROFFACTIVE_REGKEY "Control Panel\\Desktop" @@ -675,7 +678,6 @@ static void test_SPI_SETBORDER( void ) { BOOL rc; UINT old_border; - int iswin9x; NONCLIENTMETRICSA ncmsave; INT CaptionWidth; @@ -689,11 +691,6 @@ static void test_SPI_SETBORDER( void ) "Control Panel\\Desktop\\WindowMetrics","CaptionWidth", dpi); ncmsave.iCaptionWidth = CaptionWidth; - /* The SPI_SETBORDER seems to be buggy on Win9x/ME (looks like you need to - * do it twice to make the intended change). So skip parts of the tests on - * those platforms */ - iswin9x = GetVersion() & 0x80000000; - /* These tests hang when XFree86 4.0 for Windows is running (tested on * WinNT, SP2, Cygwin/XFree 4.1.0. Skip the test when XFree86 is * running. @@ -711,6 +708,9 @@ static void test_SPI_SETBORDER( void ) if ( old_border == 7 || old_border == 20 ) old_border = 1; + /* The SPI_SETBORDER seems to be buggy on Win9x/ME (looks like you need to + * do it twice to make the intended change). So skip parts of the tests on + * those platforms */ if( !iswin9x) { test_setborder(1, 1, dpi); test_setborder(0, 1, dpi); @@ -1837,6 +1837,41 @@ static void test_SPI_SETSCREENREADER( vo ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%ld\n",rc,GetLastError()); } +static void test_SPI_SETFONTSMOOTHING( void ) /* 75 */ +{ + BOOL rc; + BOOL old_b; + const UINT vals[]={0xffffffff,0,1,2}; + unsigned int i; + + trace("testing SPI_{GET,SET}FONTSMOOTHING\n"); + if( iswin9x) return; /* 95/98/ME don't seem to implement this fully */ + SetLastError(0xdeadbeef); + rc=SystemParametersInfoA( SPI_GETFONTSMOOTHING, 0, &old_b, 0 ); + if (!test_error_msg(rc,"SPI_{GET,SET}FONTSMOOTHING")) + return; + + for (i=0;i<sizeof(vals)/sizeof(*vals);i++) + { + UINT v; + + rc=SystemParametersInfoA( SPI_SETFONTSMOOTHING, vals[i], 0, + SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); + ok(rc!=0,"%d: rc=%d err=%ld\n",i,rc,GetLastError()); + test_change_message( SPI_SETFONTSMOOTHING, 0 ); + test_reg_key( SPI_SETFONTSMOOTHING_REGKEY, + SPI_SETFONTSMOOTHING_VALNAME, + vals[i] ? "2" : "0" ); + + rc=SystemParametersInfoA( SPI_GETFONTSMOOTHING, 0, &v, 0 ); + ok(rc!=0,"%d: rc=%d err=%ld\n",i,rc,GetLastError()); + eq( v, vals[i] ? 1 : 0, "SPI_GETFONTSMOOTHING", "%d" ); + } + + rc=SystemParametersInfoA( SPI_SETFONTSMOOTHING, old_b, 0, SPIF_UPDATEINIFILE ); + ok(rc!=0,"***warning*** failed to restore the original value: rc=%d err=%ld\n",rc,GetLastError()); +} + static void test_SPI_SETLOWPOWERACTIVE( void ) /* 85 */ { BOOL rc; @@ -2160,6 +2195,7 @@ static DWORD WINAPI SysParamsThreadFunc( test_SPI_SETSHOWSOUNDS(); /* 57 */ test_SPI_SETKEYBOARDPREF(); /* 69 */ test_SPI_SETSCREENREADER(); /* 71 */ + test_SPI_SETFONTSMOOTHING(); /* 75 */ test_SPI_SETLOWPOWERACTIVE(); /* 85 */ test_SPI_SETPOWEROFFACTIVE(); /* 86 */ test_SPI_SETMOUSEHOVERWIDTH(); /* 99 */ @@ -2405,6 +2441,7 @@ START_TEST(sysparams) hdc = GetDC(0); dpi = GetDeviceCaps( hdc, LOGPIXELSY); + iswin9x = GetVersion() & 0x80000000; /* This test requires interactivity, if we don't have it, give up */ if (!SystemParametersInfoA( SPI_SETBEEP, TRUE, 0, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ) &&

1 0

Eric Pouech : Fix a couple of bugs spotted by valgrind.
by Alexandre Julliard 27 Jan '06

27 Jan '06

Module: wine Branch: refs/heads/master Commit: e0cffe355ff3d99fa4b82c9f7c55b71d5bf09618 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e0cffe355ff3d99fa4b82c9… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 27 16:18:05 2006 +0100 Fix a couple of bugs spotted by valgrind. --- dlls/kernel/lcformat.c | 2 +- dlls/kernel/profile.c | 4 ++-- dlls/ntdll/tests/path.c | 4 ++-- dlls/ntdll/tests/reg.c | 2 -- libs/wine/debug.c | 4 ++-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/kernel/lcformat.c b/dlls/kernel/lcformat.c index 0f6e1e8..9f36cef 100644 --- a/dlls/kernel/lcformat.c +++ b/dlls/kernel/lcformat.c @@ -708,7 +708,7 @@ GetDateTimeFormatA_InvalidParameter: if (lpStr) { if (szOut[0]) - WideCharToMultiByte(cp, 0, szOut, -1, lpStr, cchOut, 0, 0); + WideCharToMultiByte(cp, 0, szOut, iRet ? -1 : cchOut, lpStr, cchOut, 0, 0); else if (cchOut && iRet) *lpStr = '\0'; } diff --git a/dlls/kernel/profile.c b/dlls/kernel/profile.c index 523357d..355b547 100644 --- a/dlls/kernel/profile.c +++ b/dlls/kernel/profile.c @@ -1361,9 +1361,9 @@ INT WINAPI GetPrivateProfileSectionA( LP retW = GetPrivateProfileSectionW(sectionW.Buffer, bufferW, len, filenameW.Buffer); if (len > 2) { - ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW + 2, buffer, len, NULL, NULL); + ret = WideCharToMultiByte(CP_ACP, 0, bufferW, retW + 1, buffer, len, NULL, NULL); if (ret > 2) - ret -= 2; + ret -= 1; else { ret = 0; diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index d8ba775..7b2fb73 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -266,12 +266,12 @@ static void test_RtlGetFullPathName_U(vo pRtlMultiByteToUnicodeN(pathbufW , sizeof(pathbufW), NULL, test->path, strlen(test->path)+1 ); ret = pRtlGetFullPathName_U( pathbufW,MAX_PATH, rbufferW, &file_part); ok( ret == len, "Wrong result %ld/%d for \"%s\"\n", ret, len, test->path ); - ok(pRtlUnicodeToMultiByteN(rbufferA,MAX_PATH,&reslen,rbufferW,MAX_PATH) == STATUS_SUCCESS, + ok(pRtlUnicodeToMultiByteN(rbufferA,MAX_PATH,&reslen,rbufferW,(lstrlenW(rbufferW) + 1) * sizeof(WCHAR)) == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); ok(lstrcmpiA(rbufferA,test->rname) == 0, "Got \"%s\" expected \"%s\"\n",rbufferA,test->rname); if (file_part) { - ok(pRtlUnicodeToMultiByteN(rfileA,MAX_PATH,&reslen,file_part,MAX_PATH) == STATUS_SUCCESS, + ok(pRtlUnicodeToMultiByteN(rfileA,MAX_PATH,&reslen,file_part,(lstrlenW(file_part) + 1) * sizeof(WCHAR)) == STATUS_SUCCESS, "RtlUnicodeToMultiByteN failed\n"); ok(test->rfile && !lstrcmpiA(rfileA,test->rfile), "Got \"%s\" expected \"%s\"\n",rfileA,test->rfile); } diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index c94748a..b6a0d92 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -294,7 +294,6 @@ static void test_NtCreateKey(void) { /*Create WineTest*/ OBJECT_ATTRIBUTES attr; - UNICODE_STRING ValName; HKEY key; ACCESS_MASK am = GENERIC_ALL; NTSTATUS status; @@ -303,7 +302,6 @@ static void test_NtCreateKey(void) status = pNtCreateKey(&key, am, &attr, 0, 0, 0, 0); ok(status == STATUS_SUCCESS, "NtCreateKey Failed: 0x%08lx\n", status); - pRtlFreeUnicodeString(&ValName); pNtClose(&key); } diff --git a/libs/wine/debug.c b/libs/wine/debug.c index f6ee71b..a17248b 100644 --- a/libs/wine/debug.c +++ b/libs/wine/debug.c @@ -299,7 +299,7 @@ static const char *default_dbgstr_an( co } } *dst++ = '"'; - if (*str) + if (n > 0) { *dst++ = '.'; *dst++ = '.'; @@ -352,7 +352,7 @@ static const char *default_dbgstr_wn( co } } *dst++ = '"'; - if (*str) + if (n > 0) { *dst++ = '.'; *dst++ = '.';

1 0

Eric Pouech : winedbg: Hardware breakpoints
by Alexandre Julliard 27 Jan '06

27 Jan '06

Module: wine Branch: refs/heads/master Commit: 6ab9b23526626b18fc53fb8775960d7433beb3a7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6ab9b23526626b18fc53fb8… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 27 16:17:22 2006 +0100 winedbg: Hardware breakpoints - implemented hardware assisted breakpoints (new 'hbreak' command which behaves just as 'break' command) - small improvements to break handling (saving hit xpoint across exception handling) - fixed 'cont N' command for watchpoints --- programs/winedbg/break.c | 106 +++++++++++++++++++++++++++---------------- programs/winedbg/dbg.y | 18 +++++-- programs/winedbg/debug.l | 1 programs/winedbg/debugger.h | 10 ++-- programs/winedbg/winedbg.c | 3 + 5 files changed, 88 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=6ab9b23526626b18fc5…

1 0

Eric Pouech : Suppress some false-positives reported by valgrind.
by Alexandre Julliard 27 Jan '06

27 Jan '06

Module: wine Branch: refs/heads/master Commit: 2e0b5336f60376b1ef9e570fca9e144a6bb96b53 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=2e0b5336f60376b1ef9e570… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Fri Jan 27 16:17:51 2006 +0100 Suppress some false-positives reported by valgrind. --- dlls/ntdll/signal_i386.c | 1 + server/console.c | 9 ++++++++- server/fd.c | 1 + server/request.c | 1 + 4 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index fcdccfd..5169727 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -742,6 +742,7 @@ inline static void save_context( CONTEXT { struct ntdll_thread_regs * const regs = ntdll_get_thread_regs(); + memset(context, 0, sizeof(*context)); context->ContextFlags = CONTEXT_FULL | CONTEXT_DEBUG_REGISTERS; context->Eax = EAX_sig(sigcontext); context->Ebx = EBX_sig(sigcontext); diff --git a/server/console.c b/server/console.c index f6b97bd..57a5804 100644 --- a/server/console.c +++ b/server/console.c @@ -265,7 +265,6 @@ static struct object *create_console_inp static struct screen_buffer *create_console_output( struct console_input *console_input ) { struct screen_buffer *screen_buffer; - struct console_renderer_event evt; int i; if (!(screen_buffer = alloc_object( &screen_buffer_ops ))) return NULL; @@ -302,10 +301,12 @@ static struct screen_buffer *create_cons if (!console_input->active) { + struct console_renderer_event evt; console_input->active = (struct screen_buffer*)grab_object( screen_buffer ); /* generate the initial events */ evt.event = CONSOLE_RENDERER_ACTIVE_SB_EVENT; + memset(&evt.u, 0, sizeof(evt.u)); console_input_events_append( console_input->evt, &evt ); evt.event = CONSOLE_RENDERER_SB_RESIZE_EVENT; @@ -351,6 +352,7 @@ int free_console( struct process *proces /* all processes have terminated... tell the renderer to terminate too */ struct console_renderer_event evt; evt.event = CONSOLE_RENDERER_EXIT_EVENT; + memset(&evt.u, 0, sizeof(evt.u)); console_input_events_append( console->evt, &evt ); } release_object( console ); @@ -600,6 +602,7 @@ static int set_console_input_info( const if (!(console = console_input_get( req->handle, CONSOLE_WRITE ))) goto error; + memset(&evt.u, 0, sizeof(evt.u)); if (req->mask & SET_CONSOLE_INPUT_INFO_ACTIVE_SB) { struct screen_buffer *screen_buffer; @@ -739,6 +742,7 @@ static int set_console_output_info( stru { struct console_renderer_event evt; + memset(&evt.u, 0, sizeof(evt.u)); if (req->mask & SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM) { if (req->cursor_size < 1 || req->cursor_size > 100) @@ -1067,6 +1071,7 @@ static int write_console_output( struct { struct console_renderer_event evt; evt.event = CONSOLE_RENDERER_UPDATE_EVENT; + memset(&evt.u, 0, sizeof(evt.u)); evt.u.update.top = y + x / screen_buffer->width; evt.u.update.bottom = y + (x + i - 1) / screen_buffer->width; console_input_events_append( screen_buffer->input->evt, &evt ); @@ -1117,6 +1122,7 @@ static int fill_console_output( struct s { struct console_renderer_event evt; evt.event = CONSOLE_RENDERER_UPDATE_EVENT; + memset(&evt.u, 0, sizeof(evt.u)); evt.u.update.top = y; evt.u.update.bottom = (y * screen_buffer->width + x + count - 1) / screen_buffer->width; console_input_events_append( screen_buffer->input->evt, &evt ); @@ -1230,6 +1236,7 @@ static void scroll_console_output( obj_h /* FIXME: this could be enhanced, by signalling scroll */ evt.event = CONSOLE_RENDERER_UPDATE_EVENT; + memset(&evt.u, 0, sizeof(evt.u)); evt.u.update.top = min(ysrc, ydst); evt.u.update.bottom = max(ysrc, ydst) + h - 1; console_input_events_append( screen_buffer->input->evt, &evt ); diff --git a/server/fd.c b/server/fd.c index ed98821..36cbe2a 100644 --- a/server/fd.c +++ b/server/fd.c @@ -384,6 +384,7 @@ static inline void set_fd_epoll_events( } ev.events = events; + memset(&ev.data, 0, sizeof(ev.data)); ev.data.u32 = user; if (epoll_ctl( epoll_fd, ctl, fd->unix_fd, &ev ) == -1) diff --git a/server/request.c b/server/request.c index 4793cb4..f1580d2 100644 --- a/server/request.c +++ b/server/request.c @@ -750,6 +750,7 @@ void open_master_socket(void) } /* signal parent */ + dummy = 0; write( sync_pipe[1], &dummy, 1 ); close( sync_pipe[1] ); break;

1 0

Alexandre Julliard : server: Make the FILE_SHARE_DELETE sharing checks depend on DELETE
by Alexandre Julliard 27 Jan '06

27 Jan '06

Module: wine Branch: refs/heads/master Commit: 8b0feb253bc569a39e724a8da006735166fc1b32 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8b0feb253bc569a39e724a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 15:50:38 2006 +0100 server: Make the FILE_SHARE_DELETE sharing checks depend on DELETE access instead of on the FILE_DELETE_ON_CLOSE flag (based on a patch by Mike McCormack). --- dlls/kernel/file.c | 3 +++ dlls/kernel/path.c | 2 +- dlls/kernel/tests/file.c | 20 ++++++++++++++------ dlls/ntdll/file.c | 4 ++-- dlls/ntdll/tests/change.c | 2 -- server/fd.c | 12 ++++++++---- 6 files changed, 28 insertions(+), 15 deletions(-) diff --git a/dlls/kernel/file.c b/dlls/kernel/file.c index 34a4215..9c5973a 100644 --- a/dlls/kernel/file.c +++ b/dlls/kernel/file.c @@ -1348,7 +1348,10 @@ HANDLE WINAPI CreateFileW( LPCWSTR filen else options |= FILE_NON_DIRECTORY_FILE; if (attributes & FILE_FLAG_DELETE_ON_CLOSE) + { options |= FILE_DELETE_ON_CLOSE; + access |= DELETE; + } if (!(attributes & FILE_FLAG_OVERLAPPED)) options |= FILE_SYNCHRONOUS_IO_ALERT; if (attributes & FILE_FLAG_RANDOM_ACCESS) diff --git a/dlls/kernel/path.c b/dlls/kernel/path.c index 0608f17..66c1e84 100644 --- a/dlls/kernel/path.c +++ b/dlls/kernel/path.c @@ -1277,7 +1277,7 @@ BOOL WINAPI RemoveDirectoryW( LPCWSTR pa attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtOpenFile( &handle, GENERIC_READ, &attr, &io, + status = NtOpenFile( &handle, DELETE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); if (status == STATUS_SUCCESS) diff --git a/dlls/kernel/tests/file.c b/dlls/kernel/tests/file.c index 3310670..093a893 100644 --- a/dlls/kernel/tests/file.c +++ b/dlls/kernel/tests/file.c @@ -1081,15 +1081,23 @@ static inline int is_sharing_compatible( if (!access1 || !access2) return 1; if ((access1 & GENERIC_READ) && !(sharing2 & FILE_SHARE_READ)) return 0; if ((access1 & GENERIC_WRITE) && !(sharing2 & FILE_SHARE_WRITE)) return 0; + if ((access1 & DELETE) && !(sharing2 & FILE_SHARE_DELETE)) return 0; if ((access2 & GENERIC_READ) && !(sharing1 & FILE_SHARE_READ)) return 0; if ((access2 & GENERIC_WRITE) && !(sharing1 & FILE_SHARE_WRITE)) return 0; + if ((access2 & DELETE) && !(sharing1 & FILE_SHARE_DELETE)) return 0; return 1; } static void test_file_sharing(void) { - static const DWORD access_modes[4] = { 0, GENERIC_READ, GENERIC_WRITE, GENERIC_READ|GENERIC_WRITE }; - static const DWORD sharing_modes[4] = { 0, FILE_SHARE_READ, FILE_SHARE_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE }; + static const DWORD access_modes[] = + { 0, GENERIC_READ, GENERIC_WRITE, GENERIC_READ|GENERIC_WRITE, + DELETE, GENERIC_READ|DELETE, GENERIC_WRITE|DELETE, GENERIC_READ|GENERIC_WRITE|DELETE }; + static const DWORD sharing_modes[] = + { 0, FILE_SHARE_READ, + FILE_SHARE_WRITE, FILE_SHARE_READ|FILE_SHARE_WRITE, + FILE_SHARE_DELETE, FILE_SHARE_READ|FILE_SHARE_DELETE, + FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE }; int a1, s1, a2, s2; int ret; HANDLE h, h2; @@ -1103,9 +1111,9 @@ static void test_file_sharing(void) } CloseHandle( h ); - for (a1 = 0; a1 < 4; a1++) + for (a1 = 0; a1 < sizeof(access_modes)/sizeof(access_modes[0]); a1++) { - for (s1 = 0; s1 < 4; s1++) + for (s1 = 0; s1 < sizeof(sharing_modes)/sizeof(sharing_modes[0]); s1++) { h = CreateFileA( filename, access_modes[a1], sharing_modes[s1], NULL, OPEN_EXISTING, 0, 0 ); @@ -1114,9 +1122,9 @@ static void test_file_sharing(void) ok(0,"couldn't create file \"%s\" (err=%ld)\n",filename,GetLastError()); return; } - for (a2 = 0; a2 < 4; a2++) + for (a2 = 0; a2 < sizeof(access_modes)/sizeof(access_modes[0]); a2++) { - for (s2 = 0; s2 < 4; s2++) + for (s2 = 0; s2 < sizeof(sharing_modes)/sizeof(sharing_modes[0]); s2++) { SetLastError(0xdeadbeef); h2 = CreateFileA( filename, access_modes[a2], sharing_modes[s2], diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 9ef2262..b817283 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2052,8 +2052,8 @@ NTSTATUS WINAPI NtDeleteFile( POBJECT_AT IO_STATUS_BLOCK io; TRACE("%p\n", ObjectAttributes); - status = NtCreateFile( &hFile, GENERIC_READ | GENERIC_WRITE, ObjectAttributes, - &io, NULL, 0, + status = NtCreateFile( &hFile, GENERIC_READ | GENERIC_WRITE | DELETE, + ObjectAttributes, &io, NULL, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_OPEN, FILE_DELETE_ON_CLOSE, NULL, 0 ); if (status == STATUS_SUCCESS) status = NtClose(hFile); diff --git a/dlls/ntdll/tests/change.c b/dlls/ntdll/tests/change.c index d07cb84..c347799 100644 --- a/dlls/ntdll/tests/change.c +++ b/dlls/ntdll/tests/change.c @@ -113,7 +113,6 @@ static void test_ntncdf(void) r = WaitForSingleObject( hdir, 0 ); ok( r == WAIT_OBJECT_0, "event wasn't ready\n" ); - todo_wine { r = RemoveDirectoryW( path ); ok( r == FALSE, "failed to remove directory\n"); @@ -121,7 +120,6 @@ static void test_ntncdf(void) r = RemoveDirectoryW( path ); ok( r == TRUE, "failed to remove directory\n"); - } } START_TEST(change) diff --git a/server/fd.c b/server/fd.c index a142acd..ed98821 100644 --- a/server/fd.c +++ b/server/fd.c @@ -1283,7 +1283,6 @@ static int check_sharing( struct fd *fd, { unsigned int existing_sharing = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; unsigned int existing_access = 0; - int unlink = 0; struct list *ptr; /* if access mode is 0, sharing mode is ignored */ @@ -1298,16 +1297,15 @@ static int check_sharing( struct fd *fd, { existing_sharing &= fd_ptr->sharing; existing_access |= fd_ptr->access; - if (fd_ptr->closed->unlink[0]) unlink = 1; } } if ((access & FILE_UNIX_READ_ACCESS) && !(existing_sharing & FILE_SHARE_READ)) return 0; if ((access & FILE_UNIX_WRITE_ACCESS) && !(existing_sharing & FILE_SHARE_WRITE)) return 0; + if ((access & DELETE) && !(existing_sharing & FILE_SHARE_DELETE)) return 0; if ((existing_access & FILE_UNIX_READ_ACCESS) && !(sharing & FILE_SHARE_READ)) return 0; if ((existing_access & FILE_UNIX_WRITE_ACCESS) && !(sharing & FILE_SHARE_WRITE)) return 0; - if (fd->closed->unlink[0] && !(existing_sharing & FILE_SHARE_DELETE)) return 0; - if (unlink && !(sharing & FILE_SHARE_DELETE)) return 0; + if ((existing_access & DELETE) && !(sharing & FILE_SHARE_DELETE)) return 0; return 1; } @@ -1329,6 +1327,12 @@ struct fd *open_fd( const char *name, in const char *unlink_name = ""; int rw_mode; + if ((options & FILE_DELETE_ON_CLOSE) && !(access & DELETE)) + { + set_error( STATUS_INVALID_PARAMETER ); + return NULL; + } + if (!(fd = alloc_fd_object())) return NULL; if (options & FILE_DELETE_ON_CLOSE) unlink_name = name;

1 0

Rein Klazes : user: Fix DrawTextExA/W on empty strings.
by Alexandre Julliard 27 Jan '06

27 Jan '06

Module: wine Branch: refs/heads/master Commit: ec23fb3a925058a47323c6f402d7db2918783de8 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ec23fb3a925058a47323c6f… Author: Rein Klazes <wijn(a)wanadoo.nl> Date: Fri Jan 27 15:47:15 2006 +0100 user: Fix DrawTextExA/W on empty strings. DrawTextExA/W should calculate a rectangle of zero height and width in some cases of null or empty supplied strings. With conformance tests. --- dlls/user/tests/text.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/user/text.c | 28 +++++++++++++++++++++++----- 2 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/user/tests/text.c b/dlls/user/tests/text.c index 15188f5..8d079ae 100644 --- a/dlls/user/tests/text.c +++ b/dlls/user/tests/text.c @@ -36,6 +36,9 @@ static void test_DrawTextCalcRect(void) LOGFONTA lf; const char text[] = "Example text for testing DrawText in " "MM_HIENGLISH mode"; + const WCHAR textW[] = {'W','i','d','e',' ','c','h','a','r',' ', + 's','t','r','i','n','g','\0'}; + const WCHAR emptystringW[] = { 0 }; INT textlen,textheight; RECT rect = { 0, 0, 100, 0 }; BOOL ret; @@ -100,6 +103,49 @@ static void test_DrawTextCalcRect(void) "should return a positive rectangle bottom. (bot=%ld)\n", rect.bottom); + /* empty or null text should in some cases calc an empty rectangle */ + /* note: testing the function's return value is useless, it differs + * ( 0 or 1) on every Windows version I tried */ + SetRect( &rect, 10,10, 100, 100); + textheight = DrawTextExA(hdc, (char *) text, 0, &rect, DT_CALCRECT, NULL ); + ok( !(rect.left == rect.right && rect.bottom == rect.top), + "rectangle should NOT be empty.\n"); + SetRect( &rect, 10,10, 100, 100); + SetLastError( 0); + textheight = DrawTextExA(hdc, "", -1, &rect, DT_CALCRECT, NULL ); + ok( (rect.left == rect.right && rect.bottom == rect.top), + "rectangle should be empty.\n"); + SetRect( &rect, 10,10, 100, 100); + SetLastError( 0); + textheight = DrawTextExA(hdc, NULL, -1, &rect, DT_CALCRECT, NULL ); + ok( (rect.left == rect.right && rect.bottom == rect.top), + "rectangle should be empty.\n"); + SetRect( &rect, 10,10, 100, 100); + textheight = DrawTextExA(hdc, NULL, 0, &rect, DT_CALCRECT, NULL ); + ok( !(rect.left == rect.right && rect.bottom == rect.top), + "rectangle should NOT be empty.\n"); + + /* Wide char versions */ + SetRect( &rect, 10,10, 100, 100); + SetLastError( 0); + textheight = DrawTextExW(hdc, (WCHAR *) textW, 0, &rect, DT_CALCRECT, NULL ); + if( GetLastError() != ERROR_CALL_NOT_IMPLEMENTED) { + ok( !(rect.left == rect.right && rect.bottom == rect.top), + "rectangle should NOT be empty.\n"); + SetRect( &rect, 10,10, 100, 100); + textheight = DrawTextExW(hdc, (WCHAR *) emptystringW, -1, &rect, DT_CALCRECT, NULL ); + ok( (rect.left == rect.right && rect.bottom == rect.top), + "rectangle should be empty.\n"); + SetRect( &rect, 10,10, 100, 100); + textheight = DrawTextExW(hdc, NULL, -1, &rect, DT_CALCRECT, NULL ); + ok( !(rect.left == rect.right && rect.bottom == rect.top), + "rectangle should NOT be empty.\n"); + SetRect( &rect, 10,10, 100, 100); + textheight = DrawTextExW(hdc, NULL, 0, &rect, DT_CALCRECT, NULL ); + ok( !(rect.left == rect.right && rect.bottom == rect.top), + "rectangle should NOT be empty.\n"); + } + SelectObject(hdc, hOldFont); ret = DeleteObject(hFont); ok( ret, "DeleteObject error %lu\n", GetLastError()); diff --git a/dlls/user/text.c b/dlls/user/text.c index 2c3f265..db9437e 100644 --- a/dlls/user/text.c +++ b/dlls/user/text.c @@ -864,9 +864,20 @@ INT WINAPI DrawTextExW( HDC hdc, LPWSTR if (dtp) TRACE("Params: iTabLength=%d, iLeftMargin=%d, iRightMargin=%d\n", dtp->iTabLength, dtp->iLeftMargin, dtp->iRightMargin); - if (!str) return 0; - if (count == -1) count = strlenW(str); - if (count == 0) return 0; + if (!str || count == 0) return 0; + if (count == -1) + { + count = strlenW(str); + if (count == 0) + { + if( flags & DT_CALCRECT) + { + rect->right = rect->left; + rect->bottom = rect->top; + } + return 0; + } + } strPtr = str; if (flags & DT_SINGLELINE) @@ -1020,9 +1031,16 @@ INT WINAPI DrawTextExA( HDC hdc, LPSTR s DWORD wmax; DWORD amax; - if (!str) return 0; - if (count == -1) count = strlen(str); if (!count) return 0; + if( !str || ((count == -1) && !(count = strlen(str)))) + { + if( flags & DT_CALCRECT) + { + rect->right = rect->left; + rect->bottom = rect->top; + } + return 0; + } wcount = MultiByteToWideChar( CP_ACP, 0, str, count, NULL, 0 ); wmax = wcount; amax = count;

1 0

Huw Davies : user: Don't automatically add a bunch of styles in create_editcontrol.
by Alexandre Julliard 27 Jan '06

27 Jan '06

Module: wine Branch: refs/heads/master Commit: 1b89fe49766b72017a2fcfbde1a2dafb447b7399 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=1b89fe49766b72017a2fcfb… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 27 15:47:32 2006 +0100 user: Don't automatically add a bunch of styles in create_editcontrol. --- dlls/user/tests/edit.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/user/tests/edit.c b/dlls/user/tests/edit.c index 98f1695..d92b244 100644 --- a/dlls/user/tests/edit.c +++ b/dlls/user/tests/edit.c @@ -51,7 +51,7 @@ static HWND create_editcontrol (DWORD st handle = CreateWindowEx(exstyle, "EDIT", "Test Text", - ES_AUTOHSCROLL | ES_AUTOVSCROLL | style, + style, 10, 10, 300, 300, NULL, NULL, hinst, NULL); assert (handle); @@ -84,7 +84,7 @@ static HWND create_child_editcontrol (DW editWnd = CreateWindowEx(exstyle, "EDIT", "Test Text", - WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL | ES_AUTOVSCROLL | style, + WS_CHILD | style, 0, 0, 300, 300, parentWnd, NULL, hinst, NULL); assert(editWnd); @@ -166,7 +166,7 @@ static void test_edit_control_1(void) msMessage.message = WM_KEYDOWN; trace("EDIT: Single line\n"); - hwEdit = create_editcontrol(0, 0); + hwEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); r = get_edit_style(hwEdit); ok(r == (ES_AUTOVSCROLL | ES_AUTOHSCROLL), "Wrong style expected 0xc0 got: 0x%lx\n", r); for (i=0;i<65535;i++) @@ -179,7 +179,7 @@ static void test_edit_control_1(void) DestroyWindow (hwEdit); trace("EDIT: Single line want returns\n"); - hwEdit = create_editcontrol(ES_WANTRETURN, 0); + hwEdit = create_editcontrol(ES_WANTRETURN | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); r = get_edit_style(hwEdit); ok(r == (ES_AUTOVSCROLL | ES_AUTOHSCROLL | ES_WANTRETURN), "Wrong style expected 0x10c0 got: 0x%lx\n", r); for (i=0;i<65535;i++) @@ -192,7 +192,7 @@ static void test_edit_control_1(void) DestroyWindow (hwEdit); trace("EDIT: Multiline line\n"); - hwEdit = create_editcontrol(ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL, 0); + hwEdit = create_editcontrol(ES_MULTILINE | WS_VSCROLL | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); r = get_edit_style(hwEdit); ok(r == (ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE), "Wrong style expected 0xc4 got: 0x%lx\n", r); for (i=0;i<65535;i++) @@ -205,7 +205,7 @@ static void test_edit_control_1(void) DestroyWindow (hwEdit); trace("EDIT: Multi line want returns\n"); - hwEdit = create_editcontrol(ES_MULTILINE | WS_VSCROLL | ES_AUTOVSCROLL | ES_WANTRETURN, 0); + hwEdit = create_editcontrol(ES_MULTILINE | WS_VSCROLL | ES_WANTRETURN | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); r = get_edit_style(hwEdit); ok(r == (ES_WANTRETURN | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE), "Wrong style expected 0x10c4 got: 0x%lx\n", r); for (i=0;i<65535;i++) @@ -562,7 +562,7 @@ static void test_edit_control_4(void) int i; trace("EDIT: Test EM_CHARFROMPOS and EM_POSFROMCHAR\n"); - hwEdit = create_editcontrol(0, 0); + hwEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); SendMessage(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 1, 0)); @@ -580,7 +580,7 @@ static void test_edit_control_4(void) ok(-1 == ret, "expected -1 got %d\n", ret); DestroyWindow(hwEdit); - hwEdit = create_editcontrol(ES_RIGHT, 0); + hwEdit = create_editcontrol(ES_RIGHT | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); SendMessage(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 1, 0)); @@ -598,7 +598,7 @@ static void test_edit_control_4(void) ok(-1 == ret, "expected -1 got %d\n", ret); DestroyWindow(hwEdit); - hwEdit = create_editcontrol(ES_CENTER, 0); + hwEdit = create_editcontrol(ES_CENTER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); SendMessage(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 1, 0)); @@ -616,7 +616,7 @@ static void test_edit_control_4(void) ok(-1 == ret, "expected -1 got %d\n", ret); DestroyWindow(hwEdit); - hwEdit = create_editcontrol(ES_MULTILINE, 0); + hwEdit = create_editcontrol(ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); SendMessage(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 1, 0)); @@ -634,7 +634,7 @@ static void test_edit_control_4(void) ok(-1 == ret, "expected -1 got %d\n", ret); DestroyWindow(hwEdit); - hwEdit = create_editcontrol(ES_MULTILINE | ES_RIGHT, 0); + hwEdit = create_editcontrol(ES_MULTILINE | ES_RIGHT | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); SendMessage(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 1, 0)); @@ -652,7 +652,7 @@ static void test_edit_control_4(void) ok(-1 == ret, "expected -1 got %d\n", ret); DestroyWindow(hwEdit); - hwEdit = create_editcontrol(ES_MULTILINE | ES_CENTER, 0); + hwEdit = create_editcontrol(ES_MULTILINE | ES_CENTER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); SendMessage(hwEdit, WM_SETTEXT, 0, (LPARAM) "aa"); lo = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 0, 0)); hi = LOWORD(SendMessage(hwEdit, EM_POSFROMCHAR, 1, 0)); @@ -712,7 +712,7 @@ static void test_margins(void) INT old_left_margin, old_right_margin; DWORD old_margins, new_margins; - hwEdit = create_editcontrol(WS_BORDER, 0); + hwEdit = create_editcontrol(WS_BORDER | ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); old_margins = SendMessage(hwEdit, EM_GETMARGINS, 0, 0); old_left_margin = LOWORD(old_margins); @@ -810,7 +810,7 @@ void test_text_position_style(DWORD styl /* Edit controls that are in a parent window */ - hwEdit = create_child_editcontrol(style, 0); + hwEdit = create_child_editcontrol(style | WS_VISIBLE, 0); SendMessage(hwEdit, WM_SETFONT, (WPARAM) font, (LPARAM) FALSE); if (single_line) check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 0); @@ -820,7 +820,7 @@ void test_text_position_style(DWORD styl check_pos(hwEdit, metrics.tmHeight + 10, 0, metrics.tmHeight , 0); destroy_child_editcontrol(hwEdit); - hwEdit = create_child_editcontrol(style | WS_BORDER, 0); + hwEdit = create_child_editcontrol(style | WS_BORDER | WS_VISIBLE, 0); SendMessage(hwEdit, WM_SETFONT, (WPARAM) font, (LPARAM) FALSE); if (single_line) check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, b); @@ -831,7 +831,7 @@ void test_text_position_style(DWORD styl check_pos(hwEdit, metrics.tmHeight + b3, b, metrics.tmHeight , b); destroy_child_editcontrol(hwEdit); - hwEdit = create_child_editcontrol(style, WS_EX_CLIENTEDGE); + hwEdit = create_child_editcontrol(style | WS_VISIBLE, WS_EX_CLIENTEDGE); SendMessage(hwEdit, WM_SETFONT, (WPARAM) font, (LPARAM) FALSE); if (single_line) check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 1); @@ -841,7 +841,7 @@ void test_text_position_style(DWORD styl check_pos(hwEdit, metrics.tmHeight + 10, 1, metrics.tmHeight , 1); destroy_child_editcontrol(hwEdit); - hwEdit = create_child_editcontrol(style | WS_BORDER, WS_EX_CLIENTEDGE); + hwEdit = create_child_editcontrol(style | WS_BORDER | WS_VISIBLE, WS_EX_CLIENTEDGE); SendMessage(hwEdit, WM_SETFONT, (WPARAM) font, (LPARAM) FALSE); if (single_line) check_pos(hwEdit, metrics.tmHeight - 1, 0, metrics.tmHeight - 1, 1); @@ -899,9 +899,9 @@ void test_text_position_style(DWORD styl void test_text_position(void) { trace("EDIT: Text position (Single line)\n"); - test_text_position_style(0); + test_text_position_style(ES_AUTOHSCROLL | ES_AUTOVSCROLL); trace("EDIT: Text position (Multi line)\n"); - test_text_position_style(ES_MULTILINE); + test_text_position_style(ES_MULTILINE | ES_AUTOHSCROLL | ES_AUTOVSCROLL); } static BOOL RegisterWindowClasses (void)

1 0

Alexandre Julliard : oleaut32: Ignore new test ok file.
by Alexandre Julliard 27 Jan '06

27 Jan '06

Module: wine Branch: refs/heads/master Commit: a76d5a10ed597fde3ec0cb272daa5b757e899a51 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a76d5a10ed597fde3ec0cb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 15:47:57 2006 +0100 oleaut32: Ignore new test ok file. --- dlls/oleaut32/tests/.gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/.gitignore b/dlls/oleaut32/tests/.gitignore index a2fdbc6..5524785 100644 --- a/dlls/oleaut32/tests/.gitignore +++ b/dlls/oleaut32/tests/.gitignore @@ -4,5 +4,6 @@ olepicture.ok safearray.ok testlist.c typelib.ok +usrmarshal.ok vartest.ok vartype.ok

1 0

Alexandre Julliard : shell32: Fixed a couple of FindFirstFile handle leaks.
by Alexandre Julliard 27 Jan '06

27 Jan '06

Module: wine Branch: refs/heads/master Commit: d37a119ee66ad43099791605a748013ec69c7e2f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=d37a119ee66ad4309979160… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 27 15:48:29 2006 +0100 shell32: Fixed a couple of FindFirstFile handle leaks. --- dlls/shell32/shlfileop.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 905a9c1..e12df61 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -826,6 +826,7 @@ static BOOL add_file_to_entry(FILE_ENTRY { DWORD dwLen = strlenW(szFile) + 1; LPWSTR ptr; + HANDLE h; feFile->szFullPath = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); strcpyW(feFile->szFullPath, szFile); @@ -843,8 +844,10 @@ static BOOL add_file_to_entry(FILE_ENTRY } feFile->bFromWildcard = bFromWildcard; - if (FindFirstFileW(feFile->szFullPath, &feFile->wfd) != INVALID_HANDLE_VALUE) + h = FindFirstFileW(feFile->szFullPath, &feFile->wfd); + if (h != INVALID_HANDLE_VALUE) { + FindClose(h); if (IsAttribDir(feFile->wfd.dwFileAttributes)) return TRUE; } @@ -890,7 +893,7 @@ static void parse_wildcard_files(FILE_LI flList->bAnyDirectories = TRUE; } - CloseHandle(hFile); + FindClose(hFile); } /* takes the null-separated file list and fills out the FILE_LIST */

1 0

Mike McCormack : kernel32: Implement FindFirstChangeNotification with NtNotifyChangeDirectoryFile.
by Alexandre Julliard 27 Jan '06

27 Jan '06

Module: wine Branch: refs/heads/master Commit: 53dab1520055b089f1b40d3164245b7890843294 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=53dab1520055b089f1b40d3… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jan 27 12:54:31 2006 +0100 kernel32: Implement FindFirstChangeNotification with NtNotifyChangeDirectoryFile. --- dlls/kernel/change.c | 49 ++++++++++++++++++------------------------------- 1 files changed, 18 insertions(+), 31 deletions(-) diff --git a/dlls/kernel/change.c b/dlls/kernel/change.c index d899f27..1f1b162 100644 --- a/dlls/kernel/change.c +++ b/dlls/kernel/change.c @@ -58,14 +58,14 @@ HANDLE WINAPI FindFirstChangeNotificatio OBJECT_ATTRIBUTES attr; IO_STATUS_BLOCK io; NTSTATUS status; - HANDLE file, ret = INVALID_HANDLE_VALUE; + HANDLE handle = INVALID_HANDLE_VALUE; TRACE( "%s %d %lx\n", debugstr_w(lpPathName), bWatchSubtree, dwNotifyFilter ); if (!RtlDosPathNameToNtPathName_U( lpPathName, &nt_name, NULL, NULL )) { SetLastError( ERROR_PATH_NOT_FOUND ); - return ret; + return handle; } attr.Length = sizeof(attr); @@ -75,7 +75,7 @@ HANDLE WINAPI FindFirstChangeNotificatio attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; - status = NtOpenFile( &file, SYNCHRONIZE, &attr, &io, + status = NtOpenFile( &handle, SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT ); RtlFreeUnicodeString( &nt_name ); @@ -83,21 +83,18 @@ HANDLE WINAPI FindFirstChangeNotificatio if (status != STATUS_SUCCESS) { SetLastError( RtlNtStatusToDosError(status) ); - return ret; + return INVALID_HANDLE_VALUE; } - SERVER_START_REQ( read_directory_changes ) + status = NtNotifyChangeDirectoryFile( handle, NULL, NULL, NULL, &io, + NULL, 0, dwNotifyFilter, bWatchSubtree ); + if (status != STATUS_PENDING) { - req->handle = file; - req->event = NULL; - req->filter = dwNotifyFilter; - status = wine_server_call( req ); - if (status == STATUS_PENDING) - ret = file; + NtClose( handle ); + SetLastError( RtlNtStatusToDosError(status) ); + return INVALID_HANDLE_VALUE; } - SERVER_END_REQ; - - return ret; + return handle; } /**************************************************************************** @@ -105,29 +102,19 @@ HANDLE WINAPI FindFirstChangeNotificatio */ BOOL WINAPI FindNextChangeNotification( HANDLE handle ) { - BOOL ret = FALSE; + IO_STATUS_BLOCK io; NTSTATUS status; TRACE("%p\n",handle); - if (!handle) - { - SetLastError( ERROR_INVALID_HANDLE ); - return ret; - } - - SERVER_START_REQ( read_directory_changes ) + status = NtNotifyChangeDirectoryFile( handle, NULL, NULL, NULL, &io, + NULL, 0, FILE_NOTIFY_CHANGE_SIZE, 0 ); + if (status != STATUS_PENDING) { - req->handle = handle; - req->event = NULL; - req->filter = FILE_NOTIFY_CHANGE_SIZE; /* valid but ignored */ - status = wine_server_call( req ); - if (status == STATUS_PENDING) - ret = TRUE; + SetLastError( RtlNtStatusToDosError(status) ); + return FALSE; } - SERVER_END_REQ; - - return ret; + return TRUE; } /****************************************************************************

1 0