October 2010 - Wine-commits

Jerome Leclanche : gdi32: Properly set ERROR_NOACCESS when GetObject receives invalid arguments.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: d429664016e69310930b7b15fa9c0705cb560da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d429664016e69310930b7b15f… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Thu Aug 19 14:30:49 2010 +0100 gdi32: Properly set ERROR_NOACCESS when GetObject receives invalid arguments. (cherry picked from commit da40f95efa58534d6f59dff11f8c9dbbbbb68520) --- dlls/gdi32/gdiobj.c | 14 ++++++++++++-- dlls/gdi32/tests/gdiobj.c | 8 ++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 3f84f9c..a941e2b 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -973,7 +973,12 @@ INT WINAPI GetObjectA( HGDIOBJ handle, INT count, LPVOID buffer ) GDI_ReleaseObj( handle ); if (funcs && funcs->pGetObjectA) - result = funcs->pGetObjectA( handle, count, buffer ); + { + if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ + SetLastError( ERROR_NOACCESS ); + else + result = funcs->pGetObjectA( handle, count, buffer ); + } else SetLastError( ERROR_INVALID_HANDLE ); @@ -995,7 +1000,12 @@ INT WINAPI GetObjectW( HGDIOBJ handle, INT count, LPVOID buffer ) GDI_ReleaseObj( handle ); if (funcs && funcs->pGetObjectW) - result = funcs->pGetObjectW( handle, count, buffer ); + { + if (buffer && ((ULONG_PTR)buffer >> 16) == 0) /* catch apps getting argument order wrong */ + SetLastError( ERROR_NOACCESS ); + else + result = funcs->pGetObjectW( handle, count, buffer ); + } else SetLastError( ERROR_INVALID_HANDLE ); diff --git a/dlls/gdi32/tests/gdiobj.c b/dlls/gdi32/tests/gdiobj.c index c1adc0f..7302134 100644 --- a/dlls/gdi32/tests/gdiobj.c +++ b/dlls/gdi32/tests/gdiobj.c @@ -81,6 +81,14 @@ static void test_gdi_objects(void) "GetObject(NULL obj), expected 0, NO_ERROR, got %d, %u\n", i, GetLastError()); + /* GetObject expects ERROR_NOACCESS when passed an invalid buffer */ + hp = SelectObject(hdc, GetStockObject(BLACK_PEN)); + SetLastError(0); + i = GetObjectA(hp, (INT_PTR)buff, (LPVOID)sizeof(buff)); + ok (!i && GetLastError() == ERROR_NOACCESS, + "GetObject(invalid buff), expected 0, ERROR_NOACCESS, got %d, %u\n", + i, GetLastError()); + /* GetObjectType does SetLastError() on a null object */ SetLastError(0); i = GetObjectType(NULL);

1 0

Dan Kegel : kernel32: Add error text for WSAECONNREFUSED.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: de1621619658ddb43371c8567e10a9f5b866b51e URL: http://source.winehq.org/git/wine.git/?a=commit;h=de1621619658ddb43371c8567… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Aug 27 15:27:32 2010 +0000 kernel32: Add error text for WSAECONNREFUSED. (cherry picked from commit a5bdb7dbc1e06717553d50aa6d2a53eb6544180a) --- dlls/kernel32/nls/winerr_dan.mc | 5 +++++ dlls/kernel32/nls/winerr_deu.mc | 5 +++++ dlls/kernel32/nls/winerr_enu.mc | 5 +++++ dlls/kernel32/nls/winerr_fra.mc | 5 +++++ dlls/kernel32/nls/winerr_ita.mc | 5 +++++ dlls/kernel32/nls/winerr_jpn.mc | 5 +++++ dlls/kernel32/nls/winerr_kor.mc | 5 +++++ dlls/kernel32/nls/winerr_lth.mc | 5 +++++ dlls/kernel32/nls/winerr_nld.mc | 5 +++++ dlls/kernel32/nls/winerr_nor.mc | 5 +++++ dlls/kernel32/nls/winerr_plk.mc | 5 +++++ dlls/kernel32/nls/winerr_ptb.mc | 5 +++++ dlls/kernel32/nls/winerr_ptg.mc | 5 +++++ dlls/kernel32/nls/winerr_rus.mc | 5 +++++ dlls/kernel32/nls/winerr_ukr.mc | 5 +++++ 15 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/nls/winerr_dan.mc b/dlls/kernel32/nls/winerr_dan.mc index b847952..c3033e3 100644 --- a/dlls/kernel32/nls/winerr_dan.mc +++ b/dlls/kernel32/nls/winerr_dan.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=DAN Brugernavnet blev ikke fundet . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=DAN +Forbindelse nægtet +. diff --git a/dlls/kernel32/nls/winerr_deu.mc b/dlls/kernel32/nls/winerr_deu.mc index 478f29b..71b2641 100644 --- a/dlls/kernel32/nls/winerr_deu.mc +++ b/dlls/kernel32/nls/winerr_deu.mc @@ -3734,3 +3734,8 @@ SymbolicName=NERR_UserNotFound Language=DEU Der Benutzername konnte nicht gefunden werden . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=DEU +Verbindung abgelehnt +. diff --git a/dlls/kernel32/nls/winerr_enu.mc b/dlls/kernel32/nls/winerr_enu.mc index 0c3aee4..ed36103 100644 --- a/dlls/kernel32/nls/winerr_enu.mc +++ b/dlls/kernel32/nls/winerr_enu.mc @@ -3733,3 +3733,8 @@ SymbolicName=NERR_UserNotFound Language=ENU The username could not be found . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=ENU +Connection refused +. diff --git a/dlls/kernel32/nls/winerr_fra.mc b/dlls/kernel32/nls/winerr_fra.mc index 7b3e6b6..7f96f34 100644 --- a/dlls/kernel32/nls/winerr_fra.mc +++ b/dlls/kernel32/nls/winerr_fra.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=FRA Nom d'utilisateur introuvable . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=FRA +Connexion refusée +. diff --git a/dlls/kernel32/nls/winerr_ita.mc b/dlls/kernel32/nls/winerr_ita.mc index 2ca8f36..0146857 100644 --- a/dlls/kernel32/nls/winerr_ita.mc +++ b/dlls/kernel32/nls/winerr_ita.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=ITA Impossibile trovare il nome utente . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=ITA +Connessione rifiutata +. diff --git a/dlls/kernel32/nls/winerr_jpn.mc b/dlls/kernel32/nls/winerr_jpn.mc index 64fa3b9..a419baa 100644 --- a/dlls/kernel32/nls/winerr_jpn.mc +++ b/dlls/kernel32/nls/winerr_jpn.mc @@ -3737,3 +3737,8 @@ SymbolicName=NERR_UserNotFound Language=JPN ユーザ名は見つけられません。 . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=JPN +接続は拒否されました。 +. diff --git a/dlls/kernel32/nls/winerr_kor.mc b/dlls/kernel32/nls/winerr_kor.mc index 289b17e..e7db432 100644 --- a/dlls/kernel32/nls/winerr_kor.mc +++ b/dlls/kernel32/nls/winerr_kor.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=KOR �� ̸�� ã�� ϴ� . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=KOR +Connection refused +. diff --git a/dlls/kernel32/nls/winerr_lth.mc b/dlls/kernel32/nls/winerr_lth.mc index 7278025..8f611fe 100644 --- a/dlls/kernel32/nls/winerr_lth.mc +++ b/dlls/kernel32/nls/winerr_lth.mc @@ -3734,3 +3734,8 @@ SymbolicName=NERR_UserNotFound Language=LTH Naudotojo vardas nerastas . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=LTH +Sujungimas nepriimtas +. diff --git a/dlls/kernel32/nls/winerr_nld.mc b/dlls/kernel32/nls/winerr_nld.mc index eed9f83..c33cdb3 100644 --- a/dlls/kernel32/nls/winerr_nld.mc +++ b/dlls/kernel32/nls/winerr_nld.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=NLD Gebruikersnaam niet gevonden . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=NLD +Verbinding geweigerd +. diff --git a/dlls/kernel32/nls/winerr_nor.mc b/dlls/kernel32/nls/winerr_nor.mc index d8828e1..6efdfb3 100644 --- a/dlls/kernel32/nls/winerr_nor.mc +++ b/dlls/kernel32/nls/winerr_nor.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=NOR Brukernavnet finnes ikke . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=NOR +Tilkobling nektet +. diff --git a/dlls/kernel32/nls/winerr_plk.mc b/dlls/kernel32/nls/winerr_plk.mc index 6fd397c..6395016 100644 --- a/dlls/kernel32/nls/winerr_plk.mc +++ b/dlls/kernel32/nls/winerr_plk.mc @@ -3734,3 +3734,8 @@ SymbolicName=NERR_UserNotFound Language=PLK Nie znaleziono nazwy u�ytkownika . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=PLK +Po��czenie odm�wi�o +. diff --git a/dlls/kernel32/nls/winerr_ptb.mc b/dlls/kernel32/nls/winerr_ptb.mc index 883655d..d3007e6 100644 --- a/dlls/kernel32/nls/winerr_ptb.mc +++ b/dlls/kernel32/nls/winerr_ptb.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=PTB O nome de usuário não foi encontrado . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=PTB +Conexão recusada +. diff --git a/dlls/kernel32/nls/winerr_ptg.mc b/dlls/kernel32/nls/winerr_ptg.mc index 26f2fc4..f593f6e 100644 --- a/dlls/kernel32/nls/winerr_ptg.mc +++ b/dlls/kernel32/nls/winerr_ptg.mc @@ -3734,3 +3734,8 @@ SymbolicName=NERR_UserNotFound Language=PTG O nome de utilizador não foi encontrado . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=PTG +Ligação recusada +. diff --git a/dlls/kernel32/nls/winerr_rus.mc b/dlls/kernel32/nls/winerr_rus.mc index b3142b4..07a81b0 100644 --- a/dlls/kernel32/nls/winerr_rus.mc +++ b/dlls/kernel32/nls/winerr_rus.mc @@ -3734,3 +3734,8 @@ SymbolicName=NERR_UserNotFound Language=RUS Имя пользователя не найдено . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=RUS +Соединение отвергнуто +. diff --git a/dlls/kernel32/nls/winerr_ukr.mc b/dlls/kernel32/nls/winerr_ukr.mc index 8a607b3..571dc17 100644 --- a/dlls/kernel32/nls/winerr_ukr.mc +++ b/dlls/kernel32/nls/winerr_ukr.mc @@ -3735,3 +3735,8 @@ SymbolicName=NERR_UserNotFound Language=UKR Ім'я користувача не знайдено . +MessageId=10061 +SymbolicName=WSAECONNREFUSED +Language=UKR +У з'єднанні відмовлено +.

1 0

Matt 'Murph' Finnicum : imm32: Set size of OSVERSIONINFOA before calling GetVersionExA.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 73af9efdccf79702dac04044b91b8daf8ee61520 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73af9efdccf79702dac04044b… Author: Matt 'Murph' Finnicum <mattfinn(a)gmail.com> Date: Wed Jul 28 14:08:33 2010 -0500 imm32: Set size of OSVERSIONINFOA before calling GetVersionExA. (cherry picked from commit 084bf06fe943c8f7dc5eff4b46e4d63270f5a3a6) --- dlls/imm32/imm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index c708b83..28f482c 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -1769,6 +1769,7 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd) if ( data ) return data->lastVK; + version.dwOSVersionInfoSize = sizeof(OSVERSIONINFOA); GetVersionExA( &version ); switch(version.dwPlatformId) {

1 0

Austin English : ntdll: Check for __FreeBSD_kernel__, remove redundant ifdef's, make FIXME's consistent.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 00bb35177ff1abed9ba5723a0becd58154c2a34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=00bb35177ff1abed9ba5723a0… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Aug 19 03:52:34 2010 -0500 ntdll: Check for __FreeBSD_kernel__, remove redundant ifdef's, make FIXME's consistent. (cherry picked from commit f7c197854804d99c44d306bc7b4a770b7089fc77) --- dlls/ntdll/cdrom.c | 65 +++++++++++++++++++++++++-------------------------- 1 files changed, 32 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=00bb35177ff1abed9ba57…

1 0

Alexandre Julliard : krnl386.exe: Remove 16 suffix on Get/ SetProcessDword since there's no 32-bit version.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: c190ec305ddbe9fa4fd1f5d655cad12b772236f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c190ec305ddbe9fa4fd1f5d65… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 16 10:03:26 2010 -0500 krnl386.exe: Remove 16 suffix on Get/SetProcessDword since there's no 32-bit version. (cherry picked from commit 5b6a24cc7c17d0d11fb234047569549cbcaf3056) --- dlls/krnl386.exe16/kernel.c | 4 ++-- dlls/krnl386.exe16/krnl386.exe16.spec | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/krnl386.exe16/kernel.c b/dlls/krnl386.exe16/kernel.c index 437eed1..a1f7fff 100644 --- a/dlls/krnl386.exe16/kernel.c +++ b/dlls/krnl386.exe16/kernel.c @@ -643,7 +643,7 @@ DWORD WINAPI MapProcessHandle( HANDLE hProcess ) * SetProcessDword (KERNEL.484) * 'Of course you cannot directly access Windows internal structures' */ -void WINAPI SetProcessDword16( DWORD dwProcessID, INT offset, DWORD value ) +void WINAPI SetProcessDword( DWORD dwProcessID, INT offset, DWORD value ) { TRACE("(%d, %d)\n", dwProcessID, offset ); @@ -684,7 +684,7 @@ void WINAPI SetProcessDword16( DWORD dwProcessID, INT offset, DWORD value ) * GetProcessDword (KERNEL.485) * 'Of course you cannot directly access Windows internal structures' */ -DWORD WINAPI GetProcessDword16( DWORD dwProcessID, INT offset ) +DWORD WINAPI GetProcessDword( DWORD dwProcessID, INT offset ) { DWORD x, y; STARTUPINFOW siw; diff --git a/dlls/krnl386.exe16/krnl386.exe16.spec b/dlls/krnl386.exe16/krnl386.exe16.spec index f3dbbea..f80cfcc 100644 --- a/dlls/krnl386.exe16/krnl386.exe16.spec +++ b/dlls/krnl386.exe16/krnl386.exe16.spec @@ -386,8 +386,8 @@ 481 pascal -ret16 _LeaveWin16Lock() _LeaveWin16Lock 482 pascal LoadSystemLibrary32(str) LoadLibrary32_16 # FIXME! 483 pascal MapProcessHandle(long) MapProcessHandle -484 pascal SetProcessDword(long s_word long) SetProcessDword16 -485 pascal GetProcessDword(long s_word) GetProcessDword16 +484 pascal SetProcessDword(long s_word long) SetProcessDword +485 pascal GetProcessDword(long s_word) GetProcessDword 486 pascal FreeLibrary32(long) FreeLibrary32_16 487 pascal GetModuleFileName32(long str word) GetModuleFileName32_16 488 pascal GetModuleHandle32(str) GetModuleHandle32_16 @@ -566,7 +566,7 @@ @ varargs -arch=win32 k32wsprintfA(str str) @ stdcall -arch=win32 k32wvsprintfA(ptr str ptr) @ stdcall -arch=win32 -register CommonUnimpStub() -@ stdcall -arch=win32 GetProcessDword16(long long) +@ stdcall -arch=win32 GetProcessDword(long long) @ stdcall -arch=win32 DosFileHandleToWin32Handle(long) @ stdcall -arch=win32 Win32HandleToDosFileHandle(long) @ stdcall -arch=win32 DisposeLZ32Handle(long)

1 0

André Hentschel : winebuild: Don' t segfault when run without arguments.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 3613371a8857c9aeb467ce31becb0c1b595cbd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3613371a8857c9aeb467ce31b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 7 16:36:55 2010 +0200 winebuild: Don't segfault when run without arguments. (cherry picked from commit d0f434eb3ac343d522ca4319abfd2df78367a8bd) --- tools/winebuild/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 0e662f8..4522938 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -142,13 +142,13 @@ static void set_dll_file_name( const char *name, DLLSPEC *spec ) /* set the dll name from the file name */ static void init_dll_name( DLLSPEC *spec ) { - if (!spec->file_name) + if (!spec->file_name && output_file_name) { char *p; spec->file_name = xstrdup( output_file_name ); if ((p = strrchr( spec->file_name, '.' ))) *p = 0; } - if (!spec->dll_name) /* set default name from file name */ + if (!spec->dll_name && spec->file_name) /* set default name from file name */ { char *p; spec->dll_name = xstrdup( spec->file_name );

1 0

Brad Smith : ntll: Fix the detection of the number of CPUs for OpenBSD.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 6267e97429eb4e14c0257220f3042135365bb861 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6267e97429eb4e14c0257220f… Author: Brad Smith <brad(a)comstyle.com> Date: Fri Sep 17 20:38:51 2010 -0400 ntll: Fix the detection of the number of CPUs for OpenBSD. (cherry picked from commit 466b64032f733777b517828f3fc141a77feb3cdc) --- dlls/ntdll/nt.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index a2b1023..99fe77b 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1164,15 +1164,16 @@ void fill_cpu_info(void) } #elif defined (__OpenBSD__) { - int mib[2], num; + int mib[2], num, ret; size_t len; mib[0] = CTL_HW; mib[1] = HW_NCPU; len = sizeof(num); - num = sysctl(mib, 2, &num, &len, NULL, 0); - NtCurrentTeb()->Peb->NumberOfProcessors = num; + ret = sysctl(mib, 2, &num, &len, NULL, 0); + if (!ret) + NtCurrentTeb()->Peb->NumberOfProcessors = num; } #elif defined (__APPLE__) {

1 0

Eric Pouech : dbghelp: Fix regression with prevented StackWalk on i386 CPU to be called with a NULL context .
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: b48a1f9511717e656694fdff4b6373c517e8f2e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b48a1f9511717e656694fdff4… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Sat Sep 11 12:14:59 2010 +0200 dbghelp: Fix regression with prevented StackWalk on i386 CPU to be called with a NULL context. (cherry picked from commit 1e12e90cc9ff62a3fd4a6180326454fbedffa8e5) --- dlls/dbghelp/cpu_i386.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/dbghelp/cpu_i386.c b/dlls/dbghelp/cpu_i386.c index a88b00f..7739d13 100644 --- a/dlls/dbghelp/cpu_i386.c +++ b/dlls/dbghelp/cpu_i386.c @@ -108,6 +108,9 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO WORD val; BOOL do_switch; unsigned deltapc = 1; +#ifdef __i386__ + CONTEXT _context; +#endif /* sanity check */ if (curr_mode >= stm_done) return FALSE; @@ -120,6 +123,21 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame, CO curr_mode == stm_start ? "start" : (curr_mode == stm_16bit ? "16bit" : "32bit"), (void*)(DWORD_PTR)curr_switch, (void*)(DWORD_PTR)next_switch); +#ifdef __i386__ + if (!context) + { + /* setup a pseudo context for the rest of the code (esp. unwinding) */ + context = &_context; + memset(context, 0, sizeof(*context)); + context->ContextFlags = CONTEXT_CONTROL | CONTEXT_SEGMENTS; + if (frame->AddrPC.Mode != AddrModeFlat) context->SegCs = frame->AddrPC.Segment; + context->Eip = frame->AddrPC.Offset; + if (frame->AddrFrame.Mode != AddrModeFlat) context->SegSs = frame->AddrFrame.Segment; + context->Ebp = frame->AddrFrame.Offset; + if (frame->AddrStack.Mode != AddrModeFlat) context->SegSs = frame->AddrStack.Segment; + context->Esp = frame->AddrStack.Offset; + } +#endif if (curr_mode == stm_start) { THREAD_BASIC_INFORMATION info;

1 0

Louis Lenders : kernel32: Change SetHandleCount to match behaviour on versions >WINNT.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: 4c5f302eac9777bbaf8ccd6ecad4079411153ed1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c5f302eac9777bbaf8ccd6ec… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Sep 3 20:47:30 2010 +0200 kernel32: Change SetHandleCount to match behaviour on versions >WINNT. (cherry picked from commit e793f9b0721d84de5f32518e1006efbcb1486b01) --- dlls/kernel32/file.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index dadaea6..e32d75d 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1192,7 +1192,7 @@ BOOL WINAPI UnlockFileEx( HANDLE hFile, DWORD reserved, DWORD count_low, DWORD c */ UINT WINAPI SetHandleCount( UINT count ) { - return min( 256, count ); + return count; }

1 0

Vladimir Panteleev : user32: Fix VK_RETURN handling in IsDialogMessage for dialogs without an IDOK.
by Alexandre Julliard 05 Oct '10

05 Oct '10

Module: wine Branch: stable Commit: f946ccfddb3fbeebfa6684b87359d846df76eea6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f946ccfddb3fbeebfa6684b87… Author: Vladimir Panteleev <vladimir(a)thecybershadow.net> Date: Tue Sep 14 16:46:55 2010 +0300 user32: Fix VK_RETURN handling in IsDialogMessage for dialogs without an IDOK. (cherry picked from commit 592d994f0077c19dc9fa2db988f70d5d4c2a9cdb) --- dlls/user32/dialog.c | 6 ++---- dlls/user32/tests/dialog.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index aac8a4d..052fbff 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -1221,10 +1221,8 @@ BOOL WINAPI IsDialogMessageW( HWND hwndDlg, LPMSG msg ) else if (DC_HASDEFID == HIWORD(dw = SendMessageW (hwndDlg, DM_GETDEFID, 0, 0))) { HWND hwndDef = GetDlgItem(hwndDlg, LOWORD(dw)); - if (!hwndDef || !IsWindowEnabled(hwndDef)) - return TRUE; - SendMessageW( hwndDlg, WM_COMMAND, MAKEWPARAM( LOWORD(dw), BN_CLICKED ), - (LPARAM)GetDlgItem(hwndDlg, LOWORD(dw))); + if (hwndDef ? IsWindowEnabled(hwndDef) : LOWORD(dw)==IDOK) + SendMessageW( hwndDlg, WM_COMMAND, MAKEWPARAM( LOWORD(dw), BN_CLICKED ), (LPARAM)hwndDef); } else { diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index b7727da..736c99d 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1000,6 +1000,28 @@ static INT_PTR CALLBACK TestDefButtonDlgProc (HWND hDlg, UINT uiMsg, return FALSE; } +static INT_PTR CALLBACK TestReturnKeyDlgProc (HWND hDlg, UINT uiMsg, + WPARAM wParam, LPARAM lParam) +{ + static int received_idok = 0; + switch (uiMsg) + { + case WM_INITDIALOG: + { + MSG msg = {hDlg, WM_KEYDOWN, VK_RETURN, 0x011c0001}; + IsDialogMessage(hDlg, &msg); + } + ok(received_idok, "WM_COMMAND not received\n"); + EndDialog(hDlg, 0); + return TRUE; + case WM_COMMAND: + ok(wParam==IDOK, "Expected IDOK\n"); + received_idok = 1; + return TRUE; + } + return FALSE; +} + static void test_DialogBoxParamA(void) { INT_PTR ret; @@ -1044,6 +1066,8 @@ static void test_DialogBoxParamA(void) ret = DialogBoxParamA(GetModuleHandle(NULL), "TEST_EMPTY_DIALOG", 0, TestDefButtonDlgProc, 0); ok(ret == IDOK, "Expected IDOK\n"); + + DialogBoxParamA(GetModuleHandle(NULL), "TEST_EMPTY_DIALOG", 0, TestReturnKeyDlgProc, 0); } static void test_DisabledDialogTest(void)

1 0