April 2007 - Wine-commits - list.winehq.org

Alexandre Julliard : ntdll: Reimplement NtWriteFile.
by Alexandre Julliard 07 Apr '07

07 Apr '07

Module: wine Branch: master Commit: 55f3605c37f21f6cae6d22e6ecd8f1b5790d3a8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=55f3605c37f21f6cae6d22e6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 6 16:06:16 2007 +0200 ntdll: Reimplement NtWriteFile. Always try a write() before queuing an async I/O. Handle timeout waits for synchronous I/O entirely on the client side. Queue the final APC as a proper user APC. --- dlls/ntdll/file.c | 178 +++++++++++++++++++++++++---------------------------- 1 files changed, 85 insertions(+), 93 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index b78cb48..1fb6593 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -738,8 +738,10 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, const void* buffer, ULONG length, PLARGE_INTEGER offset, PULONG key) { - int result, unix_handle, needs_close, flags; + int result, unix_handle, needs_close, flags, timeout_init_done = 0; + struct io_timeouts timeouts; NTSTATUS status; + ULONG total = 0; enum server_fd_type type; TRACE("(%p,%p,%p,%p,%p,%p,0x%08x,%p,%p)!\n", @@ -751,127 +753,117 @@ NTSTATUS WINAPI NtWriteFile(HANDLE hFile, HANDLE hEvent, &needs_close, &type, &flags ); if (status) return status; - if (type == FD_TYPE_FILE && offset) + if (type == FD_TYPE_FILE && offset && offset->QuadPart != (LONGLONG)-2 /* FILE_USE_FILE_POINTER_POSITION */ ) { - if (flags & FD_FLAG_OVERLAPPED) + /* async I/O doesn't make sense on regular files */ + while ((result = pwrite( unix_handle, buffer, length, offset->QuadPart )) == -1) { - /* async I/O doesn't make sense on regular files */ - while ((result = pwrite( unix_handle, buffer, length, offset->QuadPart )) == -1) + if (errno != EINTR) { - if (errno == EINTR) continue; - if (errno == EAGAIN || errno == ESPIPE) - { - status = STATUS_PENDING; - break; - } - result = 0; if (errno == EFAULT) status = STATUS_INVALID_USER_BUFFER; else status = FILE_GetNtStatus(); goto done; } - if (result >= 0) + } + + if (!(flags & FD_FLAG_OVERLAPPED)) /* update file pointer position */ + lseek( unix_handle, offset->QuadPart + result, SEEK_SET ); + + total = result; + status = STATUS_SUCCESS; + goto done; + } + + for (;;) + { + if ((result = write( unix_handle, (const char *)buffer + total, length - total )) >= 0) + { + total += result; + if (total == length) { - io_status->Information = result; status = STATUS_SUCCESS; - if (hEvent) NtSetEvent( hEvent, NULL ); goto done; } } else { - if (lseek( unix_handle, offset->QuadPart, SEEK_SET ) == (off_t)-1) + if (errno == EINTR) continue; + if (errno != EAGAIN) { - status = FILE_GetNtStatus(); + if (errno == EFAULT) status = STATUS_INVALID_USER_BUFFER; + else status = FILE_GetNtStatus(); goto done; } } - } - if (flags & FD_FLAG_SEND_SHUTDOWN) - { - status = STATUS_PIPE_DISCONNECTED; - goto done; - } - - if (flags & FD_FLAG_TIMEOUT) - { - if (hEvent) + if (flags & FD_FLAG_OVERLAPPED) { - /* this shouldn't happen, but check it */ - FIXME("NIY-hEvent\n"); - status = STATUS_NOT_IMPLEMENTED; - goto done; - } - status = NtCreateEvent(&hEvent, EVENT_ALL_ACCESS, NULL, 0, 0); - if (status) goto done; - } - - if (flags & (FD_FLAG_OVERLAPPED|FD_FLAG_TIMEOUT)) - { - async_fileio* fileio; + async_fileio *fileio; - if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(async_fileio)))) - { - if (flags & FD_FLAG_TIMEOUT) NtClose(hEvent); - status = STATUS_NO_MEMORY; - goto done; - } - fileio->handle = hFile; - fileio->already = 0; - fileio->count = length; - fileio->apc = apc; - fileio->apc_user = apc_user; - fileio->buffer = (void*)buffer; - fileio->queue_apc_on_error = 0; - fileio->avail_mode = (flags & FD_FLAG_AVAILABLE); - fileio->event = hEvent; - - io_status->u.Status = STATUS_PENDING; - status = fileio_queue_async(fileio, io_status, FALSE); - if (status != STATUS_PENDING) - { - if (flags & FD_FLAG_TIMEOUT) NtClose(hEvent); + if (!(fileio = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(async_fileio)))) + { + status = STATUS_NO_MEMORY; + goto done; + } + fileio->handle = hFile; + fileio->already = total; + fileio->count = length; + fileio->apc = apc; + fileio->apc_user = apc_user; + fileio->buffer = (void*)buffer; + fileio->queue_apc_on_error = 1; + fileio->event = hEvent; + status = fileio_queue_async(fileio, io_status, FALSE); goto done; } - if (needs_close) close( unix_handle ); - if (flags & FD_FLAG_TIMEOUT) + else /* synchronous write, wait for the fd to become ready */ { - while (NtWaitForSingleObject(hEvent, TRUE, NULL) == STATUS_USER_APC) /* nothing */ ; - NtClose(hEvent); - } - else - { - LARGE_INTEGER timeout; - - /* let some APC be run, this will write as much data as possible */ - timeout.u.LowPart = timeout.u.HighPart = 0; - status = NtDelayExecution( TRUE, &timeout ); - /* the apc didn't run and therefore the completion routine now - * needs to be sent errors. - * Note that there is no race between setting this flag and - * returning errors because apc's are run only during alertable - * waits */ - if (status != STATUS_USER_APC) - fileio->queue_apc_on_error = 1; + struct pollfd pfd; + int ret, timeout; + + if (!timeout_init_done) + { + timeout_init_done = 1; + if ((status = get_io_timeouts( hFile, type, length, FALSE, &timeouts ))) + goto done; + if (hEvent) NtResetEvent( hEvent, NULL ); + } + timeout = get_next_io_timeout( &timeouts, total ); + + pfd.fd = unix_handle; + pfd.events = POLLIN; + + if (!timeout || !(ret = poll( &pfd, 1, timeout ))) + { + /* return with what we got so far */ + status = total ? STATUS_SUCCESS : STATUS_TIMEOUT; + goto done; + } + if (ret == -1 && errno != EINTR) + { + status = FILE_GetNtStatus(); + goto done; + } + /* will now restart the write */ } - return io_status->u.Status; } - /* synchronous file write */ - status = STATUS_SUCCESS; - while ((result = write( unix_handle, buffer, length )) == -1) - { - if ((errno == EAGAIN) || (errno == EINTR)) continue; - result = 0; - if (errno == EFAULT) status = STATUS_INVALID_USER_BUFFER; - else status = FILE_GetNtStatus(); - break; - } - io_status->Information = result; done: if (needs_close) close( unix_handle ); - if (status != STATUS_PENDING) io_status->u.Status = status; - if (apc && !status) apc( apc_user, io_status, 0 ); + if (status == STATUS_SUCCESS) + { + io_status->u.Status = status; + io_status->Information = total; + TRACE("= SUCCESS (%u)\n", total); + if (hEvent) NtSetEvent( hEvent, NULL ); + if (apc) NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)apc, + (ULONG_PTR)apc_user, (ULONG_PTR)io_status, 0 ); + } + else + { + TRACE("= 0x%08x\n", status); + if (status != STATUS_PENDING && hEvent) NtResetEvent( hEvent, NULL ); + } return status; }

1 0

Andrew Talbot : comdlg32: Constify some variables.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: 03fc0989a32233866544ea56ea0c2c9026529202 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03fc0989a32233866544ea56e… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Apr 6 10:56:15 2007 +0100 comdlg32: Constify some variables. --- dlls/comdlg32/printdlg.c | 31 ++++++++++++++++--------------- dlls/comdlg32/printdlg16.c | 6 +++--- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 82e9023..4dc4de0 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -185,8 +185,8 @@ static INT PRINTDLG_SetUpPrinterListComboW(HWND hDlg, UINT id, LPCWSTR name) * * (NB. when we handle unicode the offsets will be in wchars). */ -static BOOL PRINTDLG_CreateDevNames(HGLOBAL *hmem, char* DeviceDriverName, - char* DeviceName, char* OutputPort) +static BOOL PRINTDLG_CreateDevNames(HGLOBAL *hmem, const char* DeviceDriverName, + const char* DeviceName, const char* OutputPort) { long size; char* pDevNamesSpace; @@ -673,8 +673,8 @@ static BOOL PRINTDLG_SetUpPaperComboBoxA(HWND hDlg, static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg, int nIDComboBox, - WCHAR* PrinterName, - WCHAR* PortName, + const WCHAR* PrinterName, + const WCHAR* PortName, LPDEVMODEW dm) { int i; @@ -785,7 +785,7 @@ static BOOL PRINTDLG_SetUpPaperComboBoxW(HWND hDlg, /*********************************************************************** * PRINTDLG_UpdatePrinterInfoTexts [internal] */ -static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, LPPRINTER_INFO_2A pi) +static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, const PRINTER_INFO_2A *pi) { char StatusMsg[256]; char ResourceString[256]; @@ -821,7 +821,7 @@ static void PRINTDLG_UpdatePrinterInfoTextsA(HWND hDlg, LPPRINTER_INFO_2A pi) return; } -static void PRINTDLG_UpdatePrinterInfoTextsW(HWND hDlg, LPPRINTER_INFO_2W pi) +static void PRINTDLG_UpdatePrinterInfoTextsW(HWND hDlg, const PRINTER_INFO_2W *pi) { WCHAR StatusMsg[256]; WCHAR ResourceString[256]; @@ -1857,7 +1857,7 @@ static INT_PTR CALLBACK PrintDlgProcW(HWND hDlg, UINT uMsg, WPARAM wParam, * PRINTDLG_GetDlgTemplate * */ -static HGLOBAL PRINTDLG_GetDlgTemplateA(PRINTDLGA *lppd) +static HGLOBAL PRINTDLG_GetDlgTemplateA(const PRINTDLGA *lppd) { HRSRC hResInfo; HGLOBAL hDlgTmpl; @@ -1891,7 +1891,7 @@ static HGLOBAL PRINTDLG_GetDlgTemplateA(PRINTDLGA *lppd) return hDlgTmpl; } -static HGLOBAL PRINTDLG_GetDlgTemplateW(PRINTDLGW *lppd) +static HGLOBAL PRINTDLG_GetDlgTemplateW(const PRINTDLGW *lppd) { HRSRC hResInfo; HGLOBAL hDlgTmpl; @@ -2325,7 +2325,7 @@ typedef struct { } PageSetupDataW; -static HGLOBAL PRINTDLG_GetPGSTemplateA(PAGESETUPDLGA *lppd) +static HGLOBAL PRINTDLG_GetPGSTemplateA(const PAGESETUPDLGA *lppd) { HRSRC hResInfo; HGLOBAL hDlgTmpl; @@ -2343,7 +2343,7 @@ static HGLOBAL PRINTDLG_GetPGSTemplateA(PAGESETUPDLGA *lppd) return hDlgTmpl; } -static HGLOBAL PRINTDLG_GetPGSTemplateW(PAGESETUPDLGW *lppd) +static HGLOBAL PRINTDLG_GetPGSTemplateW(const PAGESETUPDLGW *lppd) { HRSRC hResInfo; HGLOBAL hDlgTmpl; @@ -2421,7 +2421,7 @@ _c_size2strW(PageSetupDataW *pda,DWORD size,LPWSTR strout) { } static DWORD -_c_str2sizeA(PAGESETUPDLGA *dlga,LPCSTR strin) { +_c_str2sizeA(const PAGESETUPDLGA *dlga, LPCSTR strin) { float val; char rest[200]; @@ -2461,13 +2461,13 @@ _c_str2sizeA(PAGESETUPDLGA *dlga,LPCSTR strin) { static DWORD -_c_str2sizeW(PAGESETUPDLGW *dlga, LPCWSTR strin) { +_c_str2sizeW(const PAGESETUPDLGW *dlga, LPCWSTR strin) { char buf[200]; /* this W -> A transition is OK */ /* we need a unicode version of sscanf to avoid it */ WideCharToMultiByte(CP_ACP, 0, strin, -1, buf, sizeof(buf), NULL, NULL); - return _c_str2sizeA((PAGESETUPDLGA *)dlga, buf); + return _c_str2sizeA((const PAGESETUPDLGA *)dlga, buf); } @@ -2685,7 +2685,7 @@ PRINTDLG_PS_ChangePrinterW(HWND hDlg, PageSetupDataW *pda) { * always - TRUE */ static BOOL -PRINTDLG_PS_ChangePaperPrev(PageSetupDataA *pda) +PRINTDLG_PS_ChangePaperPrev(const PageSetupDataA *pda) { LONG width, height, x, y; RECT rtTmp; @@ -2913,7 +2913,8 @@ PRINTDLG_PS_WMCommandW( */ static UINT_PTR -PRINTDLG_DefaultPagePaintHook(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam, PageSetupDataA *pda) +PRINTDLG_DefaultPagePaintHook(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam, + const PageSetupDataA *pda) { LPRECT lprc = (LPRECT) lParam; HDC hdc = (HDC) wParam; diff --git a/dlls/comdlg32/printdlg16.c b/dlls/comdlg32/printdlg16.c index a84ee6a..4f883da 100644 --- a/dlls/comdlg32/printdlg16.c +++ b/dlls/comdlg32/printdlg16.c @@ -56,8 +56,8 @@ typedef struct /* Internal Functions */ -static BOOL PRINTDLG_CreateDevNames16(HGLOBAL16 *hmem, char* DeviceDriverName, - char* DeviceName, char* OutputPort) +static BOOL PRINTDLG_CreateDevNames16(HGLOBAL16 *hmem, const char* DeviceDriverName, + const char* DeviceName, const char* OutputPort) { long size; char* pDevNamesSpace; @@ -291,7 +291,7 @@ static BOOL PRINTDLG_CreateDC16(LPPRINTDLG16 lppd) * PRINTDLG_GetDlgTemplate * */ -static HGLOBAL16 PRINTDLG_GetDlgTemplate16(PRINTDLG16 *lppd) +static HGLOBAL16 PRINTDLG_GetDlgTemplate16(const PRINTDLG16 *lppd) { HGLOBAL16 hDlgTmpl, hResInfo;

1 0

Andrew Talbot : comdlg32: Remove inappropriate const qualifier.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: 2bd62004cf358c56be60b026c2fe46f298ed995d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bd62004cf358c56be60b026c… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Apr 6 11:09:35 2007 +0100 comdlg32: Remove inappropriate const qualifier. --- dlls/comdlg32/filedlg31.c | 2 +- dlls/comdlg32/filedlg31.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/filedlg31.c b/dlls/comdlg32/filedlg31.c index 9586773..b49cc7e 100644 --- a/dlls/comdlg32/filedlg31.c +++ b/dlls/comdlg32/filedlg31.c @@ -754,7 +754,7 @@ void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, BOOL op * FD31_FreeOfnW [internal] * Undo all allocations done by FD31_MapOfnStructA */ -void FD31_FreeOfnW(const OPENFILENAMEW *ofnW) +void FD31_FreeOfnW(OPENFILENAMEW *ofnW) { HeapFree(GetProcessHeap(), 0, (LPWSTR) ofnW->lpstrFilter); HeapFree(GetProcessHeap(), 0, ofnW->lpstrCustomFilter); diff --git a/dlls/comdlg32/filedlg31.h b/dlls/comdlg32/filedlg31.h index b86bc0f..7328f07 100644 --- a/dlls/comdlg32/filedlg31.h +++ b/dlls/comdlg32/filedlg31.h @@ -55,7 +55,7 @@ extern PFD31_DATA FD31_AllocPrivate(LPARAM lParam, UINT dlgType, PFD31_CALLBACKS callbacks, DWORD data); extern void FD31_DestroyPrivate(PFD31_DATA lfs); extern void FD31_MapOfnStructA(const OPENFILENAMEA *ofnA, LPOPENFILENAMEW ofnW, BOOL open); -extern void FD31_FreeOfnW(const OPENFILENAMEW *ofnW); +extern void FD31_FreeOfnW(OPENFILENAMEW *ofnW); extern BOOL FD31_CallWindowProc(const FD31_DATA *lfs, UINT wMsg, WPARAM wParam, LPARAM lParam); extern LONG FD31_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam);

1 0

Alexandre Julliard : kernel32: Add a bit of slack to the mailslot timeout test.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: aef2edb0cf652f80697c7ced8ee55e3ba02db7ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=aef2edb0cf652f80697c7ced8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 6 12:35:21 2007 +0200 kernel32: Add a bit of slack to the mailslot timeout test. --- dlls/kernel32/tests/mailslot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c index 850b065..6eb8d8a 100644 --- a/dlls/kernel32/tests/mailslot.c +++ b/dlls/kernel32/tests/mailslot.c @@ -299,7 +299,7 @@ static int mailslot_test(void) ok( !ReadFile( hSlot, buffer, sizeof buffer, &count, NULL), "slot read\n"); ok( GetLastError() == ERROR_SEM_TIMEOUT, "wrong error %u\n", GetLastError() ); dwTimeout = GetTickCount() - dwTimeout; - ok( dwTimeout >= 1000, "timeout too short %u\n", dwTimeout ); + ok( dwTimeout >= 990, "timeout too short %u\n", dwTimeout ); ok( CloseHandle( hSlot ), "closing the mailslot\n"); return 0;

1 0

Dmitry Timoshkov : user32: Windows uses ptMaxTrackSize to set an initial window size not ptMaxSize.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: 56852a5eac44213258f46dc4f4fe4e38d58a560c URL: http://source.winehq.org/git/wine.git/?a=commit;h=56852a5eac44213258f46dc4f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Apr 8 19:28:05 2007 +0900 user32: Windows uses ptMaxTrackSize to set an initial window size not ptMaxSize. --- dlls/user32/tests/win.c | 67 +++++++++++++++++++++++++++++++++++++------- dlls/winex11.drv/window.c | 11 +++++-- 2 files changed, 64 insertions(+), 14 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5502bf9..632fcc1 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -3718,8 +3718,36 @@ static void test_IsWindowUnicode(void) DestroyWindow(hwnd); } +static LRESULT CALLBACK minmax_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + MINMAXINFO *minmax; + + if (msg != WM_GETMINMAXINFO) + return DefWindowProc(hwnd, msg, wp, lp); + + minmax = (MINMAXINFO *)lp; + + if ((GetWindowLong(hwnd, GWL_STYLE) & WS_CHILD)) + { + minmax->ptReserved.x = 0; + minmax->ptReserved.y = 0; + minmax->ptMaxSize.x = 400; + minmax->ptMaxSize.y = 400; + minmax->ptMaxPosition.x = 300; + minmax->ptMaxPosition.y = 300; + minmax->ptMaxTrackSize.x = 200; + minmax->ptMaxTrackSize.y = 200; + minmax->ptMinTrackSize.x = 100; + minmax->ptMinTrackSize.y = 100; + } + else + DefWindowProc(hwnd, msg, wp, lp); + return 1; +} + static void test_CreateWindow(void) { + WNDCLASS cls; HWND hwnd, parent; HMENU hmenu; RECT rc, rc_minmax; @@ -3917,8 +3945,20 @@ static void test_CreateWindow(void) ok(GetLastError() == ERROR_INVALID_MENU_HANDLE, "IsMenu set error %d\n", GetLastError()); /* test child window sizing */ + cls.style = 0; + cls.lpfnWndProc = minmax_wnd_proc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandle(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszMenuName = NULL; + cls.lpszClassName = "MinMax_WndClass"; + RegisterClass(&cls); + SetLastError(0xdeadbeef); - parent = CreateWindowEx(0, "static", NULL, WS_CAPTION | WS_SYSMENU | WS_THICKFRAME, + parent = CreateWindowEx(0, "MinMax_WndClass", NULL, WS_CAPTION | WS_SYSMENU | WS_THICKFRAME, 0, 0, 100, 100, 0, 0, 0, NULL); ok(parent != 0, "CreateWindowEx error %d\n", GetLastError()); expect_menu(parent, 0); @@ -3928,19 +3968,20 @@ static void test_CreateWindow(void) memset(&minmax, 0, sizeof(minmax)); SendMessage(parent, WM_GETMINMAXINFO, 0, (LPARAM)&minmax); SetRect(&rc_minmax, 0, 0, minmax.ptMaxSize.x, minmax.ptMaxSize.y); - ok(IsRectEmpty(&rc_minmax), "rc_minmax is not empty\n"); + ok(IsRectEmpty(&rc_minmax), "ptMaxSize is not empty\n"); + SetRect(&rc_minmax, 0, 0, minmax.ptMaxTrackSize.x, minmax.ptMaxTrackSize.y); + ok(IsRectEmpty(&rc_minmax), "ptMaxTrackSize is not empty\n"); + GetWindowRect(parent, &rc); + ok(!IsRectEmpty(&rc), "parent window rect is empty\n"); GetClientRect(parent, &rc); - ok(rc_minmax.left >= rc.left && rc_minmax.top >= rc.top && - rc_minmax.right <= rc.right && rc_minmax.bottom <= rc.bottom, - "rc_minmax (%d,%d-%d,%d) is not within of parent client rect (%d,%d-%d,%d)\n", - rc_minmax.left, rc_minmax.top, rc_minmax.right, rc_minmax.bottom, - rc.left, rc.top, rc.right, rc.bottom); + ok(!IsRectEmpty(&rc), "parent client rect is empty\n"); + InflateRect(&rc, 200, 200); trace("creating child with rect (%d,%d-%d,%d)\n", rc.left, rc.top, rc.right, rc.bottom); SetLastError(0xdeadbeef); - hwnd = CreateWindowEx(0, "static", NULL, WS_CHILD | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME, + hwnd = CreateWindowEx(0, "MinMax_WndClass", NULL, WS_CHILD | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, parent, (HMENU)1, 0, NULL); ok(hwnd != 0, "CreateWindowEx error %d\n", GetLastError()); @@ -3948,10 +3989,12 @@ static void test_CreateWindow(void) expect_style(hwnd, WS_CHILD | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME); expect_ex_style(hwnd, WS_EX_WINDOWEDGE); - OffsetRect(&rc, -rc.left, -rc.top); + memset(&minmax, 0, sizeof(minmax)); + SendMessage(hwnd, WM_GETMINMAXINFO, 0, (LPARAM)&minmax); + SetRect(&rc_minmax, 0, 0, minmax.ptMaxTrackSize.x, minmax.ptMaxTrackSize.y); - GetWindowRect(hwnd, &rc_minmax); - OffsetRect(&rc_minmax, -rc_minmax.left, -rc_minmax.top); + GetWindowRect(hwnd, &rc); + OffsetRect(&rc, -rc.left, -rc.top); ok(EqualRect(&rc, &rc_minmax), "rects don't match: (%d,%d-%d,%d) and (%d,%d-%d,%d)\n", rc.left, rc.top, rc.right, rc.bottom, rc_minmax.left, rc_minmax.top, rc_minmax.right, rc_minmax.bottom); @@ -3959,6 +4002,8 @@ static void test_CreateWindow(void) DestroyWindow(hwnd); DestroyWindow(parent); + UnregisterClass("MinMax_WndClass", GetModuleHandle(0)); + #undef expect_menu #undef expect_style #undef expect_ex_style diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index a31227f..a74c095 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1078,10 +1078,15 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode ) if ((cs->style & WS_THICKFRAME) || !(cs->style & (WS_POPUP | WS_CHILD))) { POINT maxSize, maxPos, minTrack, maxTrack; - /* Although Windows sends WM_GETMINMAXINFO at the window creation time, - * it doesn't use returned values to set window size. - */ + WINPOS_GetMinMaxInfo( hwnd, &maxSize, &maxPos, &minTrack, &maxTrack); + if (maxTrack.x < cs->cx) cs->cx = maxTrack.x; + if (maxTrack.y < cs->cy) cs->cy = maxTrack.y; + if (cs->cx < 0) cs->cx = 0; + if (cs->cy < 0) cs->cy = 0; + + SetRect( &rect, cs->x, cs->y, cs->x + cs->cx, cs->y + cs->cy ); + if (!X11DRV_SetWindowPos( hwnd, 0, &rect, &rect, SWP_NOZORDER, NULL )) return FALSE; } /* send WM_NCCREATE */

1 0

Andrew Talbot : comdlg32: Constify some variables.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: 80d80c66af82ce1bd4c3538304580d880a0d69f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d80c66af82ce1bd4c353830… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Apr 6 10:55:44 2007 +0100 comdlg32: Constify some variables. --- dlls/comdlg32/finddlg16.c | 12 ++++++------ dlls/comdlg32/finddlg32.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comdlg32/finddlg16.c b/dlls/comdlg32/finddlg16.c index 113b15d..f30bae8 100644 --- a/dlls/comdlg32/finddlg16.c +++ b/dlls/comdlg32/finddlg16.c @@ -228,7 +228,7 @@ HWND16 WINAPI ReplaceText16( SEGPTR find ) * FINDDLG_WMInitDialog [internal] */ static LRESULT FINDDLG_WMInitDialog(HWND hWnd, LPARAM lParam, LPDWORD lpFlags, - LPSTR lpstrFindWhat, BOOL fUnicode) + LPCSTR lpstrFindWhat, BOOL fUnicode) { SetWindowLongPtrW(hWnd, DWLP_USER, lParam); *lpFlags &= ~(FR_FINDNEXT | FR_REPLACE | FR_REPLACEALL | FR_DIALOGTERM); @@ -237,7 +237,7 @@ static LRESULT FINDDLG_WMInitDialog(HWND hWnd, LPARAM lParam, LPDWORD lpFlags, * FindNext (IDOK) button. Only after typing some text, the button should be * enabled. */ - if (fUnicode) SetDlgItemTextW(hWnd, edt1, (LPWSTR)lpstrFindWhat); + if (fUnicode) SetDlgItemTextW(hWnd, edt1, (LPCWSTR)lpstrFindWhat); else SetDlgItemTextA(hWnd, edt1, lpstrFindWhat); CheckRadioButton(hWnd, rad1, rad2, (*lpFlags & FR_DOWN) ? rad2 : rad1); if (*lpFlags & (FR_HIDEUPDOWN | FR_NOUPDOWN)) { @@ -341,8 +341,8 @@ BOOL16 CALLBACK FindTextDlgProc16(HWND16 hWnd16, UINT16 wMsg, WPARAM16 wParam, * REPLACEDLG_WMInitDialog [internal] */ static LRESULT REPLACEDLG_WMInitDialog(HWND hWnd, LPARAM lParam, - LPDWORD lpFlags, LPSTR lpstrFindWhat, - LPSTR lpstrReplaceWith, BOOL fUnicode) + LPDWORD lpFlags, LPCSTR lpstrFindWhat, + LPCSTR lpstrReplaceWith, BOOL fUnicode) { SetWindowLongPtrW(hWnd, DWLP_USER, lParam); *lpFlags &= ~(FR_FINDNEXT | FR_REPLACE | FR_REPLACEALL | FR_DIALOGTERM); @@ -353,8 +353,8 @@ static LRESULT REPLACEDLG_WMInitDialog(HWND hWnd, LPARAM lParam, */ if (fUnicode) { - SetDlgItemTextW(hWnd, edt1, (LPWSTR)lpstrFindWhat); - SetDlgItemTextW(hWnd, edt2, (LPWSTR)lpstrReplaceWith); + SetDlgItemTextW(hWnd, edt1, (LPCWSTR)lpstrFindWhat); + SetDlgItemTextW(hWnd, edt2, (LPCWSTR)lpstrReplaceWith); } else { SetDlgItemTextA(hWnd, edt1, lpstrFindWhat); diff --git a/dlls/comdlg32/finddlg32.c b/dlls/comdlg32/finddlg32.c index 2d65526..5485804 100644 --- a/dlls/comdlg32/finddlg32.c +++ b/dlls/comdlg32/finddlg32.c @@ -299,8 +299,8 @@ static INT_PTR CALLBACK COMDLG32_FindReplaceDlgProc(HWND hDlgWnd, UINT iMsg, WPA * FALSE: Failure */ static BOOL COMDLG32_FR_CheckPartial( - LPFINDREPLACEA pfr, /* [in] Find structure */ - BOOL Replace /* [in] True if called as replace */ + const FINDREPLACEA *pfr, /* [in] Find structure */ + BOOL Replace /* [in] True if called as replace */ ) { if(!pfr) {

1 0

Andrew Talbot : comdlg32: Constify some variables.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: a855ba87da2c9107444fb35ff993b768b6ca2a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a855ba87da2c9107444fb35ff… Author: Andrew Talbot <Andrew.Talbot(a)talbotville.com> Date: Fri Apr 6 10:56:00 2007 +0100 comdlg32: Constify some variables. --- dlls/comdlg32/cdlg.h | 6 +++--- dlls/comdlg32/fontdlg.c | 16 ++++++++-------- dlls/comdlg32/fontdlg16.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/cdlg.h b/dlls/comdlg32/cdlg.h index 1d091cc..22cd5a2 100644 --- a/dlls/comdlg32/cdlg.h +++ b/dlls/comdlg32/cdlg.h @@ -213,10 +213,10 @@ typedef struct } CFn_ENUMSTRUCT, *LPCFn_ENUMSTRUCT; INT AddFontFamily(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *lpNTM, - UINT nFontType, LPCHOOSEFONTW lpcf, HWND hwnd, + UINT nFontType, const CHOOSEFONTW *lpcf, HWND hwnd, LPCFn_ENUMSTRUCT e); INT AddFontStyle(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *metrics, - UINT nFontType, LPCHOOSEFONTW lpcf, HWND hcmb2, HWND hcmb3, + UINT nFontType, const CHOOSEFONTW *lpcf, HWND hcmb2, HWND hcmb3, HWND hDlg, BOOL iswin16); void _dump_cf_flags(DWORD cflags); @@ -227,6 +227,6 @@ LRESULT CFn_WMDrawItem(HWND hDlg, WPARAM wParam, LPARAM lParam); LRESULT CFn_WMCommand(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFONTW lpcf); LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, - LPCHOOSEFONTW lpcf); + const CHOOSEFONTW *lpcf); #endif /* _WINE_DLL_CDLG_H */ diff --git a/dlls/comdlg32/fontdlg.c b/dlls/comdlg32/fontdlg.c index 2f01b3b..42833f1 100644 --- a/dlls/comdlg32/fontdlg.c +++ b/dlls/comdlg32/fontdlg.c @@ -287,7 +287,7 @@ static const COLORREF textcolors[TEXT_COLORS]= /*********************************************************************** * CFn_HookCallChk32 [internal] */ -static BOOL CFn_HookCallChk32(LPCHOOSEFONTW lpcf) +static BOOL CFn_HookCallChk32(const CHOOSEFONTW *lpcf) { if (lpcf) if(lpcf->Flags & CF_ENABLEHOOK) @@ -300,7 +300,7 @@ static BOOL CFn_HookCallChk32(LPCHOOSEFONTW lpcf) * AddFontFamily [internal] */ INT AddFontFamily(const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *lpNTM, - UINT nFontType, LPCHOOSEFONTW lpcf, HWND hwnd, LPCFn_ENUMSTRUCT e) + UINT nFontType, const CHOOSEFONTW *lpcf, HWND hwnd, LPCFn_ENUMSTRUCT e) { int i; WORD w; @@ -403,7 +403,7 @@ static int SetFontStylesToCombo2(HWND hwnd, HDC hdc, const LOGFONTW *lplf) /************************************************************************* * AddFontSizeToCombo3 [internal] */ -static int AddFontSizeToCombo3(HWND hwnd, UINT h, LPCHOOSEFONTW lpcf) +static int AddFontSizeToCombo3(HWND hwnd, UINT h, const CHOOSEFONTW *lpcf) { int j; WCHAR buffer[20]; @@ -427,7 +427,7 @@ static int AddFontSizeToCombo3(HWND hwnd, UINT h, LPCHOOSEFONTW lpcf) /************************************************************************* * SetFontSizesToCombo3 [internal] */ -static int SetFontSizesToCombo3(HWND hwnd, LPCHOOSEFONTW lpcf) +static int SetFontSizesToCombo3(HWND hwnd, const CHOOSEFONTW *lpcf) { static const BYTE sizes[]={6,7,8,9,10,11,12,14,16,18,20,22,24,26,28,36,48,72}; int i; @@ -440,7 +440,7 @@ static int SetFontSizesToCombo3(HWND hwnd, LPCHOOSEFONTW lpcf) /************************************************************************* * CFn_GetDC [internal] */ -static inline HDC CFn_GetDC(LPCHOOSEFONTW lpcf) +static inline HDC CFn_GetDC(const CHOOSEFONTW *lpcf) { HDC ret = ((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC) ? lpcf->hDC : @@ -452,7 +452,7 @@ static inline HDC CFn_GetDC(LPCHOOSEFONTW lpcf) /************************************************************************* * CFn_ReleaseDC [internal] */ -static inline void CFn_ReleaseDC(LPCHOOSEFONTW lpcf, HDC hdc) +static inline void CFn_ReleaseDC(const CHOOSEFONTW *lpcf, HDC hdc) { if(!((lpcf->Flags & CF_PRINTERFONTS) && lpcf->hDC)) ReleaseDC(0, hdc); @@ -462,7 +462,7 @@ static inline void CFn_ReleaseDC(LPCHOOSEFONTW lpcf, HDC hdc) * AddFontStyle [internal] */ INT AddFontStyle( const ENUMLOGFONTEXW *lpElfex, const NEWTEXTMETRICEXW *lpNTM, - UINT nFontType, LPCHOOSEFONTW lpcf, HWND hcmb2, HWND hcmb3, + UINT nFontType, const CHOOSEFONTW *lpcf, HWND hcmb2, HWND hcmb3, HWND hDlg, BOOL iswin16) { int i; @@ -1075,7 +1075,7 @@ static LRESULT CFn_WMDestroy(HWND hwnd, WPARAM wParam, LPARAM lParam, LPCHOOSEFO return TRUE; } -LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, LPCHOOSEFONTW lpcf) +LRESULT CFn_WMPaint(HWND hDlg, WPARAM wParam, LPARAM lParam, const CHOOSEFONTW *lpcf) { WINDOWINFO info; diff --git a/dlls/comdlg32/fontdlg16.c b/dlls/comdlg32/fontdlg16.c index 297952c..7ed63dc 100644 --- a/dlls/comdlg32/fontdlg16.c +++ b/dlls/comdlg32/fontdlg16.c @@ -72,7 +72,7 @@ static void FONT_Metrics16To32W( const TEXTMETRIC16 *pm16, pnm32w->ntmTm.tmExternalLeading = pm16->tmExternalLeading; } -static void CFn_CHOOSEFONT16to32W(LPCHOOSEFONT16 chf16, LPCHOOSEFONTW chf32w) +static void CFn_CHOOSEFONT16to32W(const CHOOSEFONT16 *chf16, LPCHOOSEFONTW chf32w) { int len; if (chf16->Flags & CF_ENABLETEMPLATE) @@ -106,7 +106,7 @@ static void CFn_CHOOSEFONT16to32W(LPCHOOSEFONT16 chf16, LPCHOOSEFONTW chf32w) /*********************************************************************** * CFn_HookCallChk [internal] */ -static BOOL CFn_HookCallChk(LPCHOOSEFONT16 lpcf) +static BOOL CFn_HookCallChk(const CHOOSEFONT16 *lpcf) { if (lpcf) if(lpcf->Flags & CF_ENABLEHOOK)

1 0

Fabian Bieler : wined3d: Add GL_EXT_framebuffer_blit to extension handler.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: dcd416edbe63939bf73b5725ed8a29030f9ae260 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcd416edbe63939bf73b5725e… Author: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu Apr 5 20:59:20 2007 +0200 wined3d: Add GL_EXT_framebuffer_blit to extension handler. --- dlls/wined3d/directx.c | 3 +++ include/wine/wined3d_gl.h | 12 ++++++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2d4024f..6ba4c28 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -679,6 +679,9 @@ BOOL IWineD3DImpl_FillGLCaps(IWineD3D *iface, Display* display) { } else if (strcmp(ThisExtn, "GL_EXT_framebuffer_object") == 0) { TRACE_(d3d_caps)(" FOUND: EXT Frame Buffer Object support\n"); gl_info->supported[EXT_FRAMEBUFFER_OBJECT] = TRUE; + } else if (strcmp(ThisExtn, "GL_EXT_framebuffer_blit") == 0) { + TRACE_(d3d_caps)(" FOUND: EXT Frame Buffer Blit support\n"); + gl_info->supported[EXT_FRAMEBUFFER_BLIT] = TRUE; } else if (strcmp(ThisExtn, "GL_EXT_blend_minmax") == 0) { TRACE_(d3d_caps)(" FOUND: EXT Blend minmax support\n"); gl_info->supported[EXT_BLEND_MINMAX] = TRUE; diff --git a/include/wine/wined3d_gl.h b/include/wine/wined3d_gl.h index 1b4744f..7a2ffdb 100644 --- a/include/wine/wined3d_gl.h +++ b/include/wine/wined3d_gl.h @@ -364,6 +364,15 @@ typedef void (APIENTRY * PGLFNGLFRAMEBUFFERTEXTURE3DEXTPROC)(GLenum target, GLen typedef void (APIENTRY * PGLFNGLFRAMEBUFFERRENDERBUFFEREXTPROC)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); typedef void (APIENTRY * PGLFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC)(GLenum target, GLenum attachment, GLenum pname, GLint *params); typedef void (APIENTRY * PGLFNGLGENERATEMIPMAPEXTPROC)(GLenum target); +/* GL_EXT_framebuffer_blit */ +#ifndef GL_EXT_framebuffer_blit +#define GL_EXT_framebuffer_blit 1 +#define GL_READ_FRAMEBUFFER_EXT 0x8CA8 +#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9 +#define GL_DRAW_FRAMEBUFFER_BINDING_EXT 0x8CA6 +#define GL_READ_FRAMEBUFFER_BINDING_EXT 0x8CAA +#endif +typedef void (APIENTRY * PGLFNGLBLITFRAMEBUFFEREXTPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); /* GL_EXT_secondary_color */ #ifndef GL_EXT_secondary_color #define GL_EXT_secondary_color 1 @@ -1508,6 +1517,7 @@ typedef enum _GL_SupportedExt { EXT_BLEND_MINMAX, EXT_FOG_COORD, EXT_FRAMEBUFFER_OBJECT, + EXT_FRAMEBUFFER_BLIT, EXT_PALETTED_TEXTURE, EXT_PIXEL_BUFFER_OBJECT, EXT_POINT_PARAMETERS, @@ -1622,6 +1632,8 @@ typedef enum _GL_SupportedExt { USE_GL_FUNC(PGLFNGLGENERATEMIPMAPEXTPROC, glGenerateMipmapEXT); \ USE_GL_FUNC(PGLFNGLGETRENDERBUFFERPARAMETERIVEXTPROC, glGetRenderbufferParameterivEXT); \ USE_GL_FUNC(PGLFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC, glGetFramebufferAttachmentParameterivEXT); \ + /* GL_EXT_framebuffer_blit */ \ + USE_GL_FUNC(PGLFNGLBLITFRAMEBUFFEREXTPROC, glBlitFramebufferEXT); \ /* GL_EXT_paletted_texture */ \ USE_GL_FUNC(PGLFNGLCOLORTABLEEXTPROC, glColorTableEXT); \ /* GL_EXT_point_parameters */ \

1 0

Dmitry Timoshkov : shlwapi: Fix a forward to user32.PrivateExtractIconExW.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: 1b2a2943b852190c4c2d12ea24efa190d3080f79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2a2943b852190c4c2d12ea2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Sun Apr 8 17:58:19 2007 +0900 shlwapi: Fix a forward to user32.PrivateExtractIconExW. --- dlls/shlwapi/shlwapi.spec | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/shlwapi.spec b/dlls/shlwapi/shlwapi.spec index 8d2cd85..c1cebdd 100644 --- a/dlls/shlwapi/shlwapi.spec +++ b/dlls/shlwapi/shlwapi.spec @@ -334,7 +334,7 @@ 334 stdcall -noname SHGetPathFromIDListWrapW(ptr ptr) 335 stdcall -noname ShellExecuteExWrapW(ptr) 336 stdcall -noname SHFileOperationWrapW(ptr) -337 stdcall @(wstr long ptr ptr long) user32.ExtractIconExW +337 stdcall @(wstr long ptr ptr long) user32.PrivateExtractIconExW 338 stdcall @(wstr long) kernel32.SetFileAttributesW 339 stdcall @(long long wstr ptr ptr long) kernel32.GetNumberFormatW 340 stdcall @(long wstr wstr long) user32.MessageBoxW

1 0

Jason Edmeades : cmd.exe: Fix dir filename / s and resolve many output differences.
by Alexandre Julliard 06 Apr '07

06 Apr '07

Module: wine Branch: master Commit: 57f76bd3cf04c177c61e1a4bea33d0b4719d45f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57f76bd3cf04c177c61e1a4be… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Apr 5 22:47:55 2007 +0100 cmd.exe: Fix dir filename /s and resolve many output differences. --- programs/cmd/directory.c | 372 ++++++++++++++++++++++++++-------------------- 1 files changed, 211 insertions(+), 161 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=57f76bd3cf04c177c61e1…

1 0