wine-commits February 2017

wine-commits@winehq.org

2 participants
838 discussions

Thierry Vermeylen : wnaspi32: Do not crash on SC_GETSET_TIMEOUTS.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 77af98e3dfdc1556d7c897451fd7973a8cb2e304 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77af98e3dfdc1556d7c897451… Author: Thierry Vermeylen <t_chan4958(a)hotmail.com> Date: Sat Feb 11 09:06:03 2017 +0000 wnaspi32: Do not crash on SC_GETSET_TIMEOUTS. Signed-off-by: Thierry Vermeylen <t_chan4958(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wnaspi32/winaspi32.c | 6 ++++++ include/wnaspi32.h | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/wnaspi32/winaspi32.c b/dlls/wnaspi32/winaspi32.c index 0ce72aa..e915fbd 100644 --- a/dlls/wnaspi32/winaspi32.c +++ b/dlls/wnaspi32/winaspi32.c @@ -573,6 +573,12 @@ DWORD __cdecl SendASPI32Command(LPSRB lpSRB) FIXME("SC_GET_DISK_INFO always return 'int13 unassociated disk'.\n"); lpSRB->diskinfo.SRB_DriveFlags = 0; /* disk is not int13 served */ return SS_COMP; + case SC_GETSET_TIMEOUTS: { + PSRB_GetSetTimeouts psrb_gst = (PSRB_GetSetTimeouts)lpSRB; + FIXME("SC_GETSET_TIMEOUTS doesn't actually change the timeout value nor does it return the current value.\n"); + psrb_gst->SRB_Status = SS_COMP; /* synchronous call, should be the same as the return value of SendASPI32Command */ + return SS_COMP; + } default: FIXME("Unknown command %d\n", lpSRB->common.SRB_Cmd); } diff --git a/include/wnaspi32.h b/include/wnaspi32.h index 9051f00..5b0f808 100644 --- a/include/wnaspi32.h +++ b/include/wnaspi32.h @@ -200,6 +200,17 @@ typedef struct tagSRB32_GetDiskInfo { BYTE SRB_Rsvd1[10]; /* 0E Reserved */ } SRB_GetDiskInfo, *PSRB_GetDiskInfo; +typedef struct tagSRB32_GetSetTimeouts { + BYTE SRB_Cmd; /* 00 ASPI cmd code = SC_GETSET_TIMEOUTS */ + BYTE SRB_Status; /* 01 ASPI command status byte */ + BYTE SRB_HaId; /* 02 ASPI host adapter number */ + BYTE SRB_Flags; /* 03 Reserved */ + DWORD SRB_Hdr_Rsvd; /* 04 Reserved */ + BYTE SRB_Target; /* 08 Target's SCSI ID */ + BYTE SRB_Lun; /* 09 Target's LUN number */ + DWORD SRB_Timeout; /* 10 Target's Timeout value */ +} SRB_GetSetTimeouts, *PSRB_GetSetTimeouts; + /* SRB header */ typedef struct tagSRB32_Header { BYTE SRB_Cmd; /* 00 ASPI cmd code = SC_RESET_DEV */

1 0

Jacek Caban : ntdll: Don't set io-> Information in server_read_file and server_write_file.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 21d14104948e28d118925d53a9bee9ef80cea7dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d14104948e28d118925d53a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 16:06:19 2017 +0100 ntdll: Don't set io->Information in server_read_file and server_write_file. Currently we set Information, but not Status. According to tests, depending on error type, none or both should be set. Both will be set when APC is used. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a6c1098..f3ff163 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -579,7 +579,6 @@ static NTSTATUS server_read_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE a status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; - if (status != STATUS_PENDING) io->Information = wine_server_reply_size( reply ); } SERVER_END_REQ; @@ -627,7 +626,6 @@ static NTSTATUS server_write_file( HANDLE handle, HANDLE event, PIO_APC_ROUTINE status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; - if (status != STATUS_PENDING) io->Information = reply->size; } SERVER_END_REQ;

1 0

Jacek Caban : server: Choose newer async object when searching from client pointer.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 13204d87cfc35b436e50925701b55e55f1ab165a URL: http://source.winehq.org/git/wine.git/?a=commit;h=13204d87cfc35b436e5092570… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 10 16:05:39 2017 +0100 server: Choose newer async object when searching from client pointer. This fixes a race. Client may release and reuse async pointer while processing APC_ASYNC_IO. It is, however, guaranteed that get_async_result will be called on the newest one known to the server. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index ec46103..ef548d1 100644 --- a/server/async.c +++ b/server/async.c @@ -255,7 +255,7 @@ struct async *create_async( struct thread *thread, struct async_queue *queue, co else async->iosb = NULL; list_add_tail( &queue->queue, &async->queue_entry ); - list_add_tail( &thread->process->asyncs, &async->process_entry ); + list_add_head( &thread->process->asyncs, &async->process_entry ); grab_object( async ); if (queue->fd) set_fd_signaled( queue->fd, 0 );

1 0

Alex Henrie : comdlg32: Don' t crash if an IShellFolder could not be created.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: e07d20f3f39220d5f1d2a2e5c85cc4d624060f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e07d20f3f39220d5f1d2a2e5c… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 14 00:00:48 2017 -0700 comdlg32: Don't crash if an IShellFolder could not be created. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 86575aa..8dda4f7 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -2951,7 +2951,8 @@ static void FILEDLG95_SHELL_Clean(HWND hwnd) IShellView_DestroyViewWindow(fodInfos->Shell.FOIShellView); IShellView_Release(fodInfos->Shell.FOIShellView); } - IShellFolder_Release(fodInfos->Shell.FOIShellFolder); + if (fodInfos->Shell.FOIShellFolder) + IShellFolder_Release(fodInfos->Shell.FOIShellFolder); IShellBrowser_Release(fodInfos->Shell.FOIShellBrowser); if (fodInfos->Shell.FOIDataObject) IDataObject_Release(fodInfos->Shell.FOIDataObject);

1 0

Alex Henrie : comdlg32: Use localized "Path does not exist" string.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: bd1b3c104ec894efb53671874027a2875da68714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd1b3c104ec894efb53671874… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 14 00:00:47 2017 -0700 comdlg32: Use localized "Path does not exist" string. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comdlg32/filedlg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 8a83163..86575aa 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -4027,9 +4027,9 @@ static BOOL BrowseSelectedFolder(HWND hwnd) if ( FAILED( IShellBrowser_BrowseObject( fodInfos->Shell.FOIShellBrowser, pidlSelection, SBSP_RELATIVE ) ) ) { - static const WCHAR notexist[] = {'P','a','t','h',' ','d','o','e','s', - ' ','n','o','t',' ','e','x','i','s','t',0}; - MessageBoxW( hwnd, notexist, fodInfos->title, MB_OK | MB_ICONEXCLAMATION ); + WCHAR buf[64]; + LoadStringW( COMDLG32_hInstance, IDS_PATHNOTEXISTING, buf, sizeof(buf)/sizeof(WCHAR) ); + MessageBoxW( hwnd, buf, fodInfos->title, MB_OK | MB_ICONEXCLAMATION ); } bBrowseSelFolder = TRUE; if(fodInfos->ofnInfos->Flags & OFN_EXPLORER)

1 0

Alistair Leslie-Hughes : winnt.h: Implement RtlSecureZeroMemory.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: d5292b1fcf049272a61753dc15eaf6782e2d6a14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5292b1fcf049272a61753dc1… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Feb 13 08:17:57 2017 +0000 winnt.h: Implement RtlSecureZeroMemory. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 1 + include/winnt.h | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/include/winbase.h b/include/winbase.h index b07d4df..4ec6f9a 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2778,6 +2778,7 @@ WINBASEAPI UINT WINAPI _lwrite(HFILE,LPCSTR,UINT); #define MoveMemory RtlMoveMemory #define ZeroMemory RtlZeroMemory #define CopyMemory RtlCopyMemory +#define SecureZeroMemory RtlSecureZeroMemory /* Wine internal functions */ diff --git a/include/winnt.h b/include/winnt.h index 72c399b..de7622f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5436,6 +5436,14 @@ typedef enum _CM_ERROR_CONTROL_TYPE #define RtlFillMemory(Destination, Length, Fill) memset((Destination),(Fill),(Length)) #define RtlZeroMemory(Destination, Length) memset((Destination),0,(Length)) +static FORCEINLINE void *RtlSecureZeroMemory(void *buffer, SIZE_T length) +{ + volatile char *ptr = buffer; + + while (length--) *ptr++ = 0; + return buffer; +} + #include <guiddef.h> typedef struct _OBJECT_TYPE_LIST {

1 0

Alistair Leslie-Hughes : dpnet/tests: Add IDirectPlay8Peer EnumHost Tests.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 8db78fdd1bf849be2d5106f85504d6201ce65e73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8db78fdd1bf849be2d5106f85… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 14 06:34:58 2017 +0000 dpnet/tests: Add IDirectPlay8Peer EnumHost Tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/client.c | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 4ea23cd..ca16f57 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -576,15 +576,22 @@ static void test_enum_service_providers_peer(void) static void test_enum_hosts_peer(void) { HRESULT hr; + IDirectPlay8Peer *peer2; IDirectPlay8Address *host = NULL; IDirectPlay8Address *local = NULL; DPN_APPLICATION_DESC appdesc; - DPNHANDLE async = 0; + DPNHANDLE async = 0, async2 = 0; + + ResetEvent(enumevent); + handlecnt = 0; memset( &appdesc, 0, sizeof(DPN_APPLICATION_DESC) ); appdesc.dwSize = sizeof( DPN_APPLICATION_DESC ); appdesc.guidApplication = appguid; + hr = CoCreateInstance(&CLSID_DirectPlay8Peer, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectPlay8Peer, (void **)&peer2); + ok(hr == S_OK, "CoCreateInstance failed with 0x%x\n", hr); + hr = CoCreateInstance( &CLSID_DirectPlay8Address, NULL, CLSCTX_ALL, &IID_IDirectPlay8Address, (LPVOID*)&local); ok(hr == S_OK, "IDirectPlay8Address failed with 0x%08x\n", hr); @@ -608,6 +615,37 @@ static void test_enum_hosts_peer(void) hr = IDirectPlay8Peer_CancelAsyncOperation(peer, async, 0); todo_wine ok(hr == S_OK, "IDirectPlay8Peer_CancelAsyncOperation failed with 0x%08x\n", hr); + /* No Initialize has been called on peer2. */ + hr = IDirectPlay8Peer_EnumHosts(peer2, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); + todo_wine ok(hr == DPNERR_UNINITIALIZED, "IDirectPlay8Peer_EnumHosts failed with 0x%08x\n", hr); + + /* Since we are running asynchronously, EnumHosts returns DPNSUCCESS_PENDING. */ + hr = IDirectPlay8Peer_EnumHosts(peer, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async, 0); + todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Peer_EnumHosts failed with 0x%08x\n", hr); + todo_wine ok(async, "No Handle returned\n"); + + hr = IDirectPlay8Peer_EnumHosts(peer, &appdesc, host, local, NULL, 0, INFINITE, 0, INFINITE, NULL, &async2, 0); + todo_wine ok(hr == DPNSUCCESS_PENDING, "IDirectPlay8Peer_EnumHosts failed with 0x%08x\n", hr); + todo_wine ok(async2, "No Handle returned\n"); + todo_wine ok(async2 != async, "Same handle returned.\n"); + + WaitForSingleObject(enumevent, 1000); + + lastAsyncCode = E_FAIL; + lastAsyncHandle = 0xdeadbeef; + hr = IDirectPlay8Peer_CancelAsyncOperation(peer, async, 0); + todo_wine ok(hr == S_OK, "IDirectPlay8Peer_CancelAsyncOperation failed with 0x%08x\n", hr); + todo_wine ok(lastAsyncCode == DPNERR_USERCANCEL, "got 0x%08x\n", lastAsyncCode); + todo_wine ok(lastAsyncHandle == async, "got 0x%08x\n", async); + + lastAsyncCode = E_FAIL; + lastAsyncHandle = 0xdeadbeef; + hr = IDirectPlay8Peer_CancelAsyncOperation(peer, async2, 0); + todo_wine ok(hr == S_OK, "IDirectPlay8Peer_CancelAsyncOperation failed with 0x%08x\n", hr); + todo_wine ok(lastAsyncCode == DPNERR_USERCANCEL, "got 0x%08x\n", lastAsyncCode); + todo_wine ok(lastAsyncHandle == async2, "got 0x%08x\n", async2); + + IDirectPlay8Peer_Release(peer2); IDirectPlay8Address_Release(local); IDirectPlay8Address_Release(host); }

1 0

Alistair Leslie-Hughes : dpnet/tests: Initial IDirectPlay8ThreadPool tests.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 98040833d3d39ce989f3ef656ed712df3b8b698a URL: http://source.winehq.org/git/wine.git/?a=commit;h=98040833d3d39ce989f3ef656… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 14 06:34:46 2017 +0000 dpnet/tests: Initial IDirectPlay8ThreadPool tests. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/tests/Makefile.in | 3 +- dlls/dpnet/tests/thread.c | 253 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 255 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98040833d3d39ce989f3e…

1 0

Nikolay Sivov : comctl32/pager: Don't block window size changes.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 14a6c98fd4ab3f8bf324dcbeab733e171c263883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14a6c98fd4ab3f8bf324dcbea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 14 07:47:39 2017 +0300 comctl32/pager: Don't block window size changes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 31 ------------------------------- dlls/comctl32/tests/pager.c | 25 ++++++++++++++++++++++++- 2 files changed, 24 insertions(+), 32 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index 171d70e..a10d3bb 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -388,34 +388,6 @@ PAGER_SetPos(PAGER_INFO* infoPtr, INT newPos, BOOL fromBtnPress) return 0; } -static LRESULT -PAGER_WindowPosChanging(PAGER_INFO* infoPtr, WINDOWPOS *winpos) -{ - if ((infoPtr->dwStyle & CCS_NORESIZE) && !(winpos->flags & SWP_NOSIZE)) - { - /* don't let the app resize the nonscrollable dimension of a control - * that was created with CCS_NORESIZE style - * (i.e. height for a horizontal pager, or width for a vertical one) */ - - /* except if the current dimension is 0 and app is setting for - * first time, then save amount as dimension. - GA 8/01 */ - - if (infoPtr->dwStyle & PGS_HORZ) - if (!infoPtr->nHeight && winpos->cy) - infoPtr->nHeight = winpos->cy; - else - winpos->cy = infoPtr->nHeight; - else - if (!infoPtr->nWidth && winpos->cx) - infoPtr->nWidth = winpos->cx; - else - winpos->cx = infoPtr->nWidth; - return 0; - } - - return DefWindowProcW (infoPtr->hwndSelf, WM_WINDOWPOSCHANGING, 0, (LPARAM)winpos); -} - /****************************************************************** * For the PGM_RECALCSIZE message (but not the other uses in * * this module), the native control does only the following: * @@ -1096,9 +1068,6 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_NCPAINT: return PAGER_NCPaint (infoPtr, (HRGN)wParam); - case WM_WINDOWPOSCHANGING: - return PAGER_WindowPosChanging (infoPtr, (WINDOWPOS*)lParam); - case WM_STYLECHANGED: return PAGER_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index 48753ff..c22cf27 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -170,7 +170,7 @@ static HWND create_pager_control( DWORD style ) static void test_pager(void) { HWND pager, child; - RECT rect; + RECT rect, rect2; pager = create_pager_control( PGS_HORZ ); if (!pager) @@ -204,6 +204,29 @@ static void test_pager(void) ok_sequence(sequences, PAGER_SEQ_INDEX, set_pos_seq, "set pos", TRUE); DestroyWindow( pager ); + + /* Test if resizing works */ + pager = create_pager_control( CCS_NORESIZE ); + ok(pager != NULL, "failed to create pager control\n"); + + GetWindowRect( pager, &rect ); + MoveWindow( pager, 0, 0, 200, 100, TRUE ); + GetWindowRect( pager, &rect2 ); + ok(rect2.right - rect2.left > rect.right - rect.left, "expected pager window to resize, %s\n", + wine_dbgstr_rect( &rect2 )); + + DestroyWindow( pager ); + + pager = create_pager_control( CCS_NORESIZE | PGS_HORZ ); + ok(pager != NULL, "failed to create pager control\n"); + + GetWindowRect( pager, &rect ); + MoveWindow( pager, 0, 0, 100, 200, TRUE ); + GetWindowRect( pager, &rect2 ); + ok(rect2.bottom - rect2.top > rect.bottom - rect.top, "expected pager window to resize, %s\n", + wine_dbgstr_rect( &rect2 )); + + DestroyWindow( pager ); } START_TEST(pager)

1 0

Nikolay Sivov : comctl32/tests: Basic test for PGN_CALCSIZE.
by Alexandre Julliard 14 Feb '17

14 Feb '17

Module: wine Branch: master Commit: 948dd848fba5aff47ddc0a1aca3140296161642f URL: http://source.winehq.org/git/wine.git/?a=commit;h=948dd848fba5aff47ddc0a1ac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 14 07:47:38 2017 +0300 comctl32/tests: Basic test for PGN_CALCSIZE. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/pager.c | 2 ++ dlls/comctl32/tests/pager.c | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index ced32be..171d70e 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -1036,6 +1036,8 @@ PAGER_WindowProc (HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { PAGER_INFO *infoPtr = (PAGER_INFO *)GetWindowLongPtrW(hwnd, 0); + TRACE("(%p, %#x, %#lx, %#lx)\n", hwnd, uMsg, wParam, lParam); + if (!infoPtr && (uMsg != WM_CREATE)) return DefWindowProcW (hwnd, uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c index d352140..48753ff 100644 --- a/dlls/comctl32/tests/pager.c +++ b/dlls/comctl32/tests/pager.c @@ -83,6 +83,28 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP add_message(sequences, PAGER_SEQ_INDEX, &msg); } + if (message == WM_NOTIFY) + { + NMHDR *nmhdr = (NMHDR *)lParam; + + switch (nmhdr->code) + { + case PGN_CALCSIZE: + { + NMPGCALCSIZE *nmpgcs = (NMPGCALCSIZE *)lParam; + DWORD style = GetWindowLongA(nmpgcs->hdr.hwndFrom, GWL_STYLE); + + if (style & PGS_HORZ) + ok(nmpgcs->dwFlag == PGF_CALCWIDTH, "Unexpected flags %#x.\n", nmpgcs->dwFlag); + else + ok(nmpgcs->dwFlag == PGF_CALCHEIGHT, "Unexpected flags %#x.\n", nmpgcs->dwFlag); + break; + } + default: + ; + } + } + defwndproc_counter++; ret = DefWindowProcA(hwnd, message, wParam, lParam); defwndproc_counter--;

1 0

← Newer
1
...
44
45
46
47
48
49
50
...
84
Older →

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 February 2017