August 2009 - Wine-Commits - list.winehq.org

Aric Stewart : winemp3: A fix for security alert CVE-2006-1655.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: e9aaea044be5f23c5d7f8a706a9e22e39b032f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9aaea044be5f23c5d7f8a706… Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Aug 7 11:48:27 2009 -0500 winemp3: A fix for security alert CVE-2006-1655. --- dlls/winemp3.acm/layer3.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winemp3.acm/layer3.c b/dlls/winemp3.acm/layer3.c index c655dcd..17f5a7a 100644 --- a/dlls/winemp3.acm/layer3.c +++ b/dlls/winemp3.acm/layer3.c @@ -1061,8 +1061,9 @@ maybe still wrong??? (copy 12 to 13?) */ * and mode = mixed_mode */ int sfb = gr_info->maxbandl; - int idx = bi->longIdx[sfb]; - + int idx; + if(sfb > 21) return; /* similarity fix related to CVE-2006-1655 */ + idx = bi->longIdx[sfb]; for ( ; sfb<8; sfb++ ) { int sb = bi->longDiff[sfb]; @@ -1085,7 +1086,9 @@ maybe still wrong??? (copy 12 to 13?) */ else /* ((gr_info->block_type != 2)) */ { int sfb = gr_info->maxbandl; - int is_p,idx = bi->longIdx[sfb]; + int is_p,idx; + if (sfb > 21) return; /* tightened fix for CVE-2006-1655 */ + idx = bi->longIdx[sfb]; for ( ; sfb<21; sfb++) { int sb = bi->longDiff[sfb];

1 0

Rein Klazes : comdlg32/tests: Fix some test failures on Win95 and NT4.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: b7a852b1df82079dc54546f94e965b30b1990cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7a852b1df82079dc54546f94… Author: Rein Klazes <wijn(a)online.nl> Date: Mon Aug 10 11:11:23 2009 +0200 comdlg32/tests: Fix some test failures on Win95 and NT4. Reported by Paul Vriens. --- dlls/comdlg32/tests/filedlg.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index cb9508e..ade7f8d 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -736,6 +736,7 @@ static LONG_PTR WINAPI template_hook_arrange(HWND dlgChild, UINT msg, WPARAM wPa /* the real tests */ int withhelp; int expectx, expecty; + DWORD style; withhelp = (arrange_tests[index].ofnflags & OFN_SHOWHELP) != 0; GetWindowRect( dlgParent, &wrcParent); @@ -762,7 +763,9 @@ static LONG_PTR WINAPI template_hook_arrange(HWND dlgChild, UINT msg, WPARAM wPa else expectx += clrcChild.right - ( rcStc32.right - rcStc32.left) ; } - if( !(arrange_tests[index].ofnflags & OFN_ENABLESIZING)) { + style = GetWindowLong( dlgParent, GWL_STYLE); + if( !(style & WS_SIZEBOX)) { + /* without the OFN_ENABLESIZING flag */ ok( wrcParent.bottom - wrcParent.top == expecty, "Wrong height of dialog %d, expected %d\n", wrcParent.bottom - wrcParent.top, expecty); @@ -770,6 +773,7 @@ static LONG_PTR WINAPI template_hook_arrange(HWND dlgChild, UINT msg, WPARAM wPa "Wrong width of dialog %d, expected %d\n", wrcParent.right - wrcParent.left, expectx); } else todo_wine { + /* with the OFN_ENABLESIZING flag */ ok( wrcParent.bottom - wrcParent.top > expecty, "Wrong height of dialog %d, expected more than %d\n", wrcParent.bottom - wrcParent.top, expecty);

1 0

Andrew Nguyen : user32/tests: Fix some test failures on Windows.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: e903872fd277a9755f0143313111b93dd32b83d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e903872fd277a9755f0143313… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Aug 10 01:36:11 2009 -0500 user32/tests: Fix some test failures on Windows. --- dlls/user32/tests/dialog.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 35a1c94..8fe1cc4 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -947,6 +947,7 @@ static void test_DialogBoxParamA(void) ret = DialogBoxParamA(GetModuleHandle(NULL), "IDD_DIALOG", 0, DestroyDlgWinProc, 0); ok(-1 == ret, "DialogBoxParamA returned %d, expected -1\n", ret); ok(ERROR_INVALID_WINDOW_HANDLE == GetLastError() || + GetLastError() == ERROR_SUCCESS || broken(GetLastError() == 0xdeadbeef), "got %d, expected ERROR_INVALID_WINDOW_HANDLE\n",GetLastError());

1 0

Andrew Nguyen : msvcrt: Remove dead code in wcscpy_s.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 15b0087d6e9ea67c7bed3162f9c5633c97becd22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b0087d6e9ea67c7bed3162f… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Mon Aug 10 01:26:04 2009 -0500 msvcrt: Remove dead code in wcscpy_s. --- dlls/msvcrt/wcs.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 09c87dd..d83dd94 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1070,9 +1070,6 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con return MSVCRT_ERANGE; } - if(size > numElement) - size = numElement; - memcpy( wcDest, wcSrc, size*sizeof(WCHAR) ); return 0;

1 0

André Hentschel : winecfg: Update German translation.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 0879b83fe3e46aff02921247cafb6be38c980ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0879b83fe3e46aff02921247c… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 9 15:08:16 2009 +0200 winecfg: Update German translation. --- programs/winecfg/De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index e6bed15..9a2e5e6 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -90,7 +90,7 @@ BEGIN CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,161,187,15 EDITTEXT IDC_RES_DPIEDIT,204,161,23,13,ES_NUMBER|WS_TABSTOP LTEXT "dpi",IDC_STATIC,235,163,10,8 - LTEXT "This is a sample text using 10 point Tahoma",IDC_RES_FONT_PREVIEW,15,181,230,55 + LTEXT "Dies ist ein Beispieltext in 10 Punkt Tahoma",IDC_RES_FONT_PREVIEW,15,181,230,55 END IDD_DLLCFG DIALOG DISCARDABLE 0, 0, 260, 250 @@ -129,7 +129,7 @@ STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Laufwerkszuordnung ",IDC_STATIC,8,4,244,240 - LTEXT "Failed to connect to the mount manager, the drive configuration cannot be edited.", IDC_STATIC_MOUNTMGR_ERROR, 15,30,220,76 + LTEXT "Fehler beim Verbinden mit dem Mountmanager. Die Laufwerkskonfiguration kann nicht bearbeitet werden.", IDC_STATIC_MOUNTMGR_ERROR, 15,30,220,76 CONTROL "Listview",IDC_LIST_DRIVES,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,18,232,76 PUSHBUTTON "&Hinzufügen",IDC_BUTTON_ADD,15,98,41,14

1 0

Roderick Colenbrander : wined3d: Get rid of two dead render target lock mode options.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 5a00c8053eb8deeb2540d6cc9952eada089fcf25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a00c8053eb8deeb2540d6cc9… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Aug 8 23:04:25 2009 +0200 wined3d: Get rid of two dead render target lock mode options. --- dlls/wined3d/surface.c | 7 ++----- dlls/wined3d/texture.c | 5 ++--- dlls/wined3d/wined3d_main.c | 10 ---------- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 66bdbed..29ad00d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1515,13 +1515,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { switch(wined3d_settings.rendertargetlock_mode) { case RTL_READTEX: - case RTL_TEXTEX: IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL /* partial texture loading not supported yet */); /* drop through */ case RTL_AUTO: case RTL_READDRAW: - case RTL_TEXDRAW: IWineD3DSurface_LoadLocation(iface, SFLAG_INDRAWABLE, fullsurface ? NULL : &This->dirtyRect); break; } @@ -4058,7 +4056,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) CONVERT_TYPES convert; /* Check if we are using a RTL mode which uses texturing for uploads */ - BOOL use_texture = (wined3d_settings.rendertargetlock_mode == RTL_READTEX || wined3d_settings.rendertargetlock_mode == RTL_TEXTEX); + BOOL use_texture = (wined3d_settings.rendertargetlock_mode == RTL_READTEX); /* Check if we have hardware palette conversion if we have convert is set to NO_CONVERSION */ d3dfmt_get_conv(This, TRUE, use_texture, &format, &internal, &type, &convert, &bpp, FALSE); @@ -4165,8 +4163,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_PrivateSetup(IWineD3DSurface *iface) { */ if(This->Flags & SFLAG_NONPOW2 && GL_SUPPORT(ARB_TEXTURE_RECTANGLE) && !((This->resource.format_desc->format == WINED3DFMT_P8) && GL_SUPPORT(EXT_PALETTED_TEXTURE) - && (wined3d_settings.rendertargetlock_mode == RTL_READTEX - || wined3d_settings.rendertargetlock_mode == RTL_TEXTEX))) + && (wined3d_settings.rendertargetlock_mode == RTL_READTEX))) { This->texture_target = GL_TEXTURE_RECTANGLE_ARB; This->pow2Width = This->currentDesc.Width; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d89b3b5..8f0b980 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -199,7 +199,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT /* Precalculated scaling for 'faked' non power of two texture coords. * Second also don't use ARB_TEXTURE_RECTANGLE in case the surface format is P8 and EXT_PALETTED_TEXTURE - * is used in combination with texture uploads (RTL_READTEX/RTL_TEXTEX). The reason is that EXT_PALETTED_TEXTURE + * is used in combination with texture uploads (RTL_READTEX). The reason is that EXT_PALETTED_TEXTURE * doesn't work in combination with ARB_TEXTURE_RECTANGLE. */ if (GL_SUPPORT(WINE_NORMALIZED_TEXRECT) && (width != pow2_width || height != pow2_height)) { @@ -213,8 +213,7 @@ HRESULT texture_init(IWineD3DTextureImpl *texture, UINT width, UINT height, UINT } else if (GL_SUPPORT(ARB_TEXTURE_RECTANGLE) && (width != pow2_width || height != pow2_height) && !((format_desc->format == WINED3DFMT_P8) && GL_SUPPORT(EXT_PALETTED_TEXTURE) - && (wined3d_settings.rendertargetlock_mode == RTL_READTEX - || wined3d_settings.rendertargetlock_mode == RTL_TEXTEX))) + && (wined3d_settings.rendertargetlock_mode == RTL_READTEX))) { if ((width != 1) || (height != 1)) texture->baseTexture.pow2Matrix_identity = FALSE; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 045eea0..2d3c222 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -252,16 +252,6 @@ static BOOL wined3d_init(HINSTANCE hInstDLL) TRACE("Using glReadPixels for render target reading and textures for writing\n"); wined3d_settings.rendertargetlock_mode = RTL_READTEX; } - else if (!strcmp(buffer,"texdraw")) - { - TRACE("Using textures for render target reading and glDrawPixels for writing\n"); - wined3d_settings.rendertargetlock_mode = RTL_TEXDRAW; - } - else if (!strcmp(buffer,"textex")) - { - TRACE("Reading render targets via textures and writing via textures\n"); - wined3d_settings.rendertargetlock_mode = RTL_TEXTEX; - } } if ( !get_config_key_dword( hkey, appkey, "VideoPciDeviceID", &tmpvalue) ) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d3e1053..d791092 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -270,8 +270,6 @@ static inline float float_24_to_32(DWORD in) #define RTL_AUTO 0 #define RTL_READDRAW 1 #define RTL_READTEX 2 -#define RTL_TEXDRAW 3 -#define RTL_TEXTEX 4 #define PCI_VENDOR_NONE 0xffff /* e.g. 0x8086 for Intel and 0x10de for Nvidia */ #define PCI_DEVICE_NONE 0xffff /* e.g. 0x14f for a Geforce6200 */

1 0

Mike Kaplinskiy : ws2_32/tests: Fix the last failures on NT4/2000.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 5b1992b46655fcea46d64f17f3e4c58384718eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b1992b46655fcea46d64f17f… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Aug 8 16:41:32 2009 -0400 ws2_32/tests: Fix the last failures on NT4/2000. --- dlls/ws2_32/tests/sock.c | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6cbea0e..d372d4a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2990,10 +2990,18 @@ static void test_AcceptEx(void) acceptor = INVALID_SOCKET; dwret = WaitForSingleObject(overlapped.hEvent, 1000); - ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + ok(dwret == WAIT_OBJECT_0 || broken(dwret == WAIT_TIMEOUT) /* NT4/2000 */, + "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); - bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); - ok(!bret && GetLastError() == ERROR_OPERATION_ABORTED, "GetOverlappedResult failed, error %d\n", GetLastError()); + if (dwret != WAIT_TIMEOUT) { + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + ok(!bret && GetLastError() == ERROR_OPERATION_ABORTED, "GetOverlappedResult failed, error %d\n", GetLastError()); + } + else { + bret = CancelIo((HANDLE) listener); + ok(bret, "Failed to cancel failed test. Bailing...\n"); + if (!bret) return; + } acceptor = socket(AF_INET, SOCK_STREAM, 0); if (acceptor == INVALID_SOCKET) {

1 0

Mike Kaplinskiy : ntdll/tests: Test NtCancelIoFileEx, if present.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: ebc7c138e74b51990a694bd9147051b3f606cff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebc7c138e74b51990a694bd91… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sat Aug 8 16:32:34 2009 -0400 ntdll/tests: Test NtCancelIoFileEx, if present. --- dlls/ntdll/tests/file.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 164c2da..174daa5 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -54,6 +54,7 @@ static NTSTATUS (WINAPI *pNtWriteFile)(HANDLE hFile, HANDLE hEvent, PIO_STATUS_BLOCK io_status, const void* buffer, ULONG length, PLARGE_INTEGER offset, PULONG key); +static NTSTATUS (WINAPI *pNtCancelIoFileEx)(HANDLE hFile, PIO_STATUS_BLOCK iosb, PIO_STATUS_BLOCK io_status); static NTSTATUS (WINAPI *pNtClose)( PHANDLE ); static NTSTATUS (WINAPI *pNtCreateIoCompletion)(PHANDLE, ACCESS_MASK, POBJECT_ATTRIBUTES, ULONG); @@ -355,6 +356,33 @@ static void read_file_test(void) ok( apc_count == 1, "apc was not called\n" ); CloseHandle( read ); + if (pNtCancelIoFileEx) + { + IO_STATUS_BLOCK iosb2; + /* test param order for NtCancelIoFileEx */ + if (!create_pipe( &read, &write, FILE_FLAG_OVERLAPPED, 4096 )) return; + apc_count = 0; + U(iosb).Status = 0xdeadbabe; + iosb.Information = 0xdeadbeef; + status = pNtReadFile( read, event, apc, &apc_count, &iosb, buffer, 2, NULL, NULL ); + ok( status == STATUS_PENDING, "wrong status %x\n", status ); + ok( !is_signaled( event ), "event is signaled\n" ); + ok( U(iosb).Status == 0xdeadbabe, "wrong status %x\n", U(iosb).Status ); + ok( iosb.Information == 0xdeadbeef, "wrong info %lu\n", iosb.Information ); + ok( !apc_count, "apc was called\n" ); + status = pNtCancelIoFileEx( read, &iosb, &iosb2 ); + ok(status == STATUS_SUCCESS, "Failed to cancel I/O\n"); + Sleep(1); /* FIXME: needed for wine to run the i/o apc */ + ok( U(iosb).Status == STATUS_CANCELLED, "wrong status %x\n", U(iosb).Status ); + ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); + ok( is_signaled( event ), "event is signaled\n" ); + ok( !apc_count, "apc was called\n" ); + SleepEx( 1, TRUE ); /* alertable sleep */ + ok( apc_count == 1, "apc was not called\n" ); + CloseHandle( read ); + CloseHandle( write ); + } + /* now try a real file */ if (!(handle = create_temp_file( FILE_FLAG_OVERLAPPED ))) return; apc_count = 0; @@ -712,6 +740,7 @@ START_TEST(file) pNtDeleteFile = (void *)GetProcAddress(hntdll, "NtDeleteFile"); pNtReadFile = (void *)GetProcAddress(hntdll, "NtReadFile"); pNtWriteFile = (void *)GetProcAddress(hntdll, "NtWriteFile"); + pNtCancelIoFileEx = (void *)GetProcAddress(hntdll, "NtCancelIoFileEx"); pNtClose = (void *)GetProcAddress(hntdll, "NtClose"); pNtCreateIoCompletion = (void *)GetProcAddress(hntdll, "NtCreateIoCompletion"); pNtOpenIoCompletion = (void *)GetProcAddress(hntdll, "NtOpenIoCompletion");

1 0

Akihiro Sagawa : shell32: Use IDS_DESKTOPDIRECTORY for CSIDL_COMMON_DESKTOPDIRECTORY.
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: c6a947d2ecfaaa55cee0b054d66154ab6b9b8914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6a947d2ecfaaa55cee0b054d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sat Aug 8 00:28:30 2009 +0900 shell32: Use IDS_DESKTOPDIRECTORY for CSIDL_COMMON_DESKTOPDIRECTORY. --- dlls/shell32/shellpath.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 0f07a85..805be6f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -953,7 +953,7 @@ static const CSIDL_DATA CSIDL_Data[] = { /* 0x19 - CSIDL_COMMON_DESKTOPDIRECTORY */ CSIDL_Type_AllUsers, Common_DesktopW, - MAKEINTRESOURCEW(IDS_DESKTOP) + MAKEINTRESOURCEW(IDS_DESKTOPDIRECTORY) }, { /* 0x1a - CSIDL_APPDATA */ CSIDL_Type_User,

1 0

Rein Klazes : comdlg32: In the file dialog change the position of the file browser when the application changes that of the invisible listbox control .
by Alexandre Julliard Aug. 10, 2009

Aug. 10, 2009

Module: wine Branch: master Commit: 1b740dd14a23b0387c599b65c30b751c7ff1a707 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b740dd14a23b0387c599b65c… Author: Rein Klazes <wijn(a)online.nl> Date: Sat Aug 8 11:19:42 2009 +0200 comdlg32: In the file dialog change the position of the file browser when the application changes that of the invisible listbox control. --- dlls/comdlg32/filedlg.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index de3dc38..4986122 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1150,7 +1150,7 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l case WM_INITDIALOG: { FileOpenDlgInfos * fodInfos = (FileOpenDlgInfos *)lParam; - RECT rc; + RECT rc, rcstc; int gripx = GetSystemMetrics( SM_CYHSCROLL); int gripy = GetSystemMetrics( SM_CYVSCROLL); @@ -1185,6 +1185,18 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); } + /* if the app has changed the position of the invisible listbox, + * change that of the listview (browser) as well */ + GetWindowRect( fodInfos->ShellInfos.hwndView, &rc); + GetWindowRect( GetDlgItem( hwnd, IDC_SHELLSTATIC ), &rcstc); + if( !EqualRect( &rc, &rcstc)) + { + MapWindowPoints( NULL, hwnd, (LPPOINT) &rcstc, 2); + SetWindowPos( fodInfos->ShellInfos.hwndView, NULL, + rcstc.left, rcstc.top, rcstc.right - rcstc.left, rcstc.bottom - rcstc.top, + SWP_NOACTIVATE | SWP_NOZORDER); + } + if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) { GetWindowRect( hwnd, &rc);

1 0