wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Alexandre Julliard : makefiles: Always generate the subdirs makefiles from the main makefile.
by Alexandre Julliard 23 Feb '10

23 Feb '10

Module: wine Branch: master Commit: 64362acfea895d257610a640ea5142ecf20131b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64362acfea895d257610a640e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 13:33:52 2010 +0100 makefiles: Always generate the subdirs makefiles from the main makefile. --- aclocal.m4 | 3 +- configure | 542 +--------------------------------------------------------- configure.ac | 2 +- 3 files changed, 4 insertions(+), 543 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=64362acfea895d257610a…

1 0

Hans Leidekker : wininet: Fix a memory leak.
by Alexandre Julliard 23 Feb '10

23 Feb '10

Module: wine Branch: master Commit: 911d0df69178e108e4836b1828a3a1f71c482b73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=911d0df69178e108e4836b182… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 23 13:03:37 2010 +0100 wininet: Fix a memory leak. Found by Valgrind. --- dlls/wininet/http.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 62c3953..ab7e1da 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4431,7 +4431,7 @@ static INT HTTP_GetResponseHeaders(http_request_t *lpwhr, BOOL clear) char bufferA[MAX_REPLY_LEN]; LPWSTR status_code = NULL, status_text = NULL; DWORD cchMaxRawHeaders = 1024; - LPWSTR lpszRawHeaders = HeapAlloc(GetProcessHeap(), 0, (cchMaxRawHeaders+1)*sizeof(WCHAR)); + LPWSTR lpszRawHeaders = NULL; LPWSTR temp; DWORD cchRawHeaders = 0; BOOL codeHundred = FALSE; @@ -4507,6 +4507,9 @@ static INT HTTP_GetResponseHeaders(http_request_t *lpwhr, BOOL clear) *(status_text-1) = ' '; /* regenerate raw headers */ + lpszRawHeaders = HeapAlloc(GetProcessHeap(), 0, (cchMaxRawHeaders + 1) * sizeof(WCHAR)); + if (!lpszRawHeaders) goto lend; + while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders) cchMaxRawHeaders *= 2; temp = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR));

1 0

Hans Leidekker : msi: Add tests for creating and removing duplicate files.
by Alexandre Julliard 23 Feb '10

23 Feb '10

Module: wine Branch: master Commit: 5c596171215645de10fde8395be415cbbf5c0e70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c596171215645de10fde8395… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 23 13:00:18 2010 +0100 msi: Add tests for creating and removing duplicate files. --- dlls/msi/tests/install.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 70013e5..e97d48a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -1452,6 +1452,54 @@ static const CHAR pub_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "PublishProduct\t\t5200\n" "InstallFinalize\t\t6000\n"; +static const CHAR rd_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "original.txt\tduplicate\toriginal.txt\t1000\t\t\t8192\t1\n" + "original2.txt\tduplicate\toriginal2.txt\t1000\t\t\t8192\t2\n" + "original3.txt\tduplicate2\toriginal3.txt\t1000\t\t\t8192\t3\n"; + +static const CHAR rd_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "duplicate\t\t\tduplicate feature\t1\t2\tMSITESTDIR\t0\n"; + +static const CHAR rd_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "duplicate\tduplicate\n"; + +static const CHAR rd_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "duplicate\t{EB45D06A-ADFE-44E3-8D41-B7DE150E41AD}\tMSITESTDIR\t0\t\toriginal.txt\n" + "duplicate2\t{B8BA60E0-B2E9-488E-9D0E-E60F25F04F97}\tMSITESTDIR\t0\tDUPLICATE2=1\toriginal3.txt\n"; + +static const CHAR rd_duplicate_file_dat[] = "FileKey\tComponent_\tFile_\tDestName\tDestFolder\n" + "s72\ts72\ts72\tS255\tS72\n" + "DuplicateFile\tFileKey\n" + "duplicate\tduplicate\toriginal.txt\tduplicate.txt\t\n" + "duplicate2\tduplicate\toriginal2.txt\t\tMSITESTDIR\n" + "duplicate3\tduplicate2\toriginal3.txt\tduplicate2.txt\t\n"; + +static const CHAR rd_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" + "s72\tS255\tI2\n" + "InstallExecuteSequence\tAction\n" + "LaunchConditions\t\t100\n" + "CostInitialize\t\t800\n" + "FileCost\t\t900\n" + "CostFinalize\t\t1000\n" + "InstallValidate\t\t1400\n" + "InstallInitialize\t\t1500\n" + "ProcessComponents\t\t1600\n" + "RemoveDuplicateFiles\t\t1900\n" + "InstallFiles\t\t2000\n" + "DuplicateFiles\t\t2100\n" + "RegisterProduct\t\t5000\n" + "PublishFeatures\t\t5100\n" + "PublishProduct\t\t5200\n" + "InstallFinalize\t\t6000\n"; + typedef struct _msi_table { const CHAR *filename; @@ -2302,6 +2350,19 @@ static const msi_table pub_tables[] = ADD_TABLE(property) }; +static const msi_table rd_tables[] = +{ + ADD_TABLE(directory), + ADD_TABLE(rd_component), + ADD_TABLE(rd_feature), + ADD_TABLE(rd_feature_comp), + ADD_TABLE(rd_file), + ADD_TABLE(rd_duplicate_file), + ADD_TABLE(rd_install_exec_seq), + ADD_TABLE(media), + ADD_TABLE(property) +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -8302,6 +8363,39 @@ static void test_publish_components(void) delete_test_files(); } +static void test_remove_duplicate_files(void) +{ + UINT r; + + create_test_files(); + create_file("msitest\\original.txt", 1000); + create_file("msitest\\original2.txt", 1000); + create_file("msitest\\original3.txt", 1000); + create_database(msifile, rd_tables, sizeof(rd_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(pf_exists("msitest\\original.txt"), "file not created\n"); + ok(pf_exists("msitest\\original2.txt"), "file not created\n"); + ok(!pf_exists("msitest\\original3.txt"), "file created\n"); + ok(pf_exists("msitest\\duplicate.txt"), "file not created\n"); + ok(!pf_exists("msitest\\duplicate2.txt"), "file created\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + + ok(delete_pf("msitest\\original.txt", TRUE), "file removed\n"); + ok(!delete_pf("msitest\\original2.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest\\original3.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest\\duplicate.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest\\duplicate2.txt", TRUE), "file not removed\n"); + ok(delete_pf("msitest", FALSE), "directory removed\n"); + delete_test_files(); +} + START_TEST(install) { DWORD len; @@ -8404,6 +8498,7 @@ START_TEST(install) test_register_typelib(); test_create_remove_shortcut(); test_publish_components(); + test_remove_duplicate_files(); DeleteFileA(log_file);

1 0

Hans Leidekker : msi: Implement the RemoveDuplicateFiles standard action.
by Alexandre Julliard 23 Feb '10

23 Feb '10

Module: wine Branch: master Commit: 253a7fa73c9cdf0f4fae2a85fecb760c37633232 URL: http://source.winehq.org/git/wine.git/?a=commit;h=253a7fa73c9cdf0f4fae2a85f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 23 12:59:52 2010 +0100 msi: Implement the RemoveDuplicateFiles standard action. --- dlls/msi/action.c | 8 -- dlls/msi/files.c | 216 ++++++++++++++++++++++++++++++++++------------------ dlls/msi/msipriv.h | 2 + 3 files changed, 144 insertions(+), 82 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=253a7fa73c9cdf0f4fae2…

1 0

Alexandre Julliard : krnl386.exe: Add an explicit name check to allow importing user.exe and gdi. exe even if not loaded already.
by Alexandre Julliard 23 Feb '10

23 Feb '10

Module: wine Branch: master Commit: f3696e489b8b33011b5a32acf330f0684b6d151a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3696e489b8b33011b5a32acf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 13:30:52 2010 +0100 krnl386.exe: Add an explicit name check to allow importing user.exe and gdi.exe even if not loaded already. --- dlls/krnl386.exe16/ne_module.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/krnl386.exe16/ne_module.c b/dlls/krnl386.exe16/ne_module.c index aa1c9c2..49b527b 100644 --- a/dlls/krnl386.exe16/ne_module.c +++ b/dlls/krnl386.exe16/ne_module.c @@ -782,9 +782,12 @@ static BOOL NE_LoadDLLs( NE_MODULE *pModule ) /* its handle in the list of DLLs to initialize. */ HMODULE16 hDLL; + /* special magic for gdi and user */ + if (!NE_strcasecmp( buffer, "user" )) strcpy( buffer, "USER.EXE" ); + else if (!NE_strcasecmp( buffer, "gdi" )) strcpy( buffer, "GDI.EXE" ); /* Append .DLL to name if no extension present */ - if (!(p = strrchr( buffer, '.')) || strchr( p, '/' ) || strchr( p, '\\')) - strcat( buffer, ".DLL" ); + else if (!(p = strrchr( buffer, '.')) || strchr( p, '/' ) || strchr( p, '\\')) + strcat( buffer, ".DLL" ); if ((hDLL = MODULE_LoadModule16( buffer, TRUE, TRUE )) < 32) {

1 0

Alexandre Julliard : winex11: Switch owner window to managed when displaying one of its popups.
by Alexandre Julliard 23 Feb '10

23 Feb '10

Module: wine Branch: master Commit: 913cab135356956f6a8be9fd8f3986bbeabf97fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=913cab135356956f6a8be9fd8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 12:35:10 2010 +0100 winex11: Switch owner window to managed when displaying one of its popups. --- dlls/winex11.drv/window.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 400d4c1..1847527 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1008,6 +1008,12 @@ static Window get_owner_whole_window( HWND owner ) if (!(data = X11DRV_create_win_data( owner ))) return (Window)GetPropA( owner, whole_window_prop ); } + else if (!data->managed) /* make it managed */ + { + SetWindowPos( owner, 0, 0, 0, 0, 0, + SWP_NOACTIVATE | SWP_NOZORDER | SWP_NOSIZE | SWP_NOMOVE | + SWP_NOREDRAW | SWP_DEFERERASE | SWP_NOSENDCHANGING | SWP_STATECHANGED ); + } return data->whole_window; }

1 0

Alexandre Julliard : winex11: Windows that own popups should be managed.
by Alexandre Julliard 23 Feb '10

23 Feb '10

Module: wine Branch: master Commit: 391afac66fe4865cef2fa9508e8741fca2cd4fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=391afac66fe4865cef2fa9508… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 12:34:19 2010 +0100 winex11: Windows that own popups should be managed. --- dlls/winex11.drv/window.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index fdaa012..400d4c1 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -142,6 +142,31 @@ static void remove_startup_notification(Display *display, Window window) } +struct has_popup_result +{ + HWND hwnd; + BOOL found; +}; + +static BOOL CALLBACK has_popup( HWND hwnd, LPARAM lparam ) +{ + struct has_popup_result *result = (struct has_popup_result *)lparam; + + if (hwnd == result->hwnd) return FALSE; /* popups are always above owner */ + result->found = (GetWindow( hwnd, GW_OWNER ) == result->hwnd); + return !result->found; +} + +static BOOL has_owned_popups( HWND hwnd ) +{ + struct has_popup_result result; + + result.hwnd = hwnd; + result.found = FALSE; + EnumWindows( has_popup, (LPARAM)&result ); + return result.found; +} + /*********************************************************************** * is_window_managed * @@ -181,6 +206,8 @@ static BOOL is_window_managed( HWND hwnd, UINT swp_flags, const RECT *window_rec /* application windows are managed */ ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); if (ex_style & WS_EX_APPWINDOW) return TRUE; + /* windows that own popups are managed */ + if (has_owned_popups( hwnd )) return TRUE; /* default: not managed */ return FALSE; }

1 0

Alexandre Julliard : winex11: Make sure that the owner window exists when setting the transient for attribute .
by Alexandre Julliard 23 Feb '10

23 Feb '10

Module: wine Branch: master Commit: 7b3a00c09ece0031d2fddd0d3e79c7187f95700e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b3a00c09ece0031d2fddd0d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 12:33:01 2010 +0100 winex11: Make sure that the owner window exists when setting the transient for attribute. --- dlls/winex11.drv/window.c | 37 +++++++++++++++++++++++++------------ 1 files changed, 25 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 1f40eba..fdaa012 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -966,13 +966,34 @@ static void set_initial_wm_hints( Display *display, struct x11drv_win_data *data /*********************************************************************** + * get_owner_whole_window + * + * Retrieve an owner's window, creating it if necessary. + */ +static Window get_owner_whole_window( HWND owner ) +{ + struct x11drv_win_data *data; + + if (!owner) return 0; + + if (!(data = X11DRV_get_win_data( owner ))) + { + if (!(data = X11DRV_create_win_data( owner ))) + return (Window)GetPropA( owner, whole_window_prop ); + } + return data->whole_window; +} + + +/*********************************************************************** * set_wm_hints * * Set the window manager hints for a newly-created window */ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) { - Window group_leader; + Window group_leader = data->whole_window; + Window owner_win = 0; Atom window_type; MwmHints mwm_hints; DWORD style, ex_style; @@ -990,21 +1011,13 @@ static void set_wm_hints( Display *display, struct x11drv_win_data *data ) style = GetWindowLongW( data->hwnd, GWL_STYLE ); ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); owner = get_window_owner( data->hwnd ); + if ((owner_win = get_owner_whole_window( owner ))) group_leader = owner_win; } - /* transient for hint */ - if (owner) - { - Window owner_win = X11DRV_get_whole_window( owner ); - wine_tsx11_lock(); - XSetTransientForHint( display, data->whole_window, owner_win ); - wine_tsx11_unlock(); - group_leader = owner_win; - } - else group_leader = data->whole_window; - wine_tsx11_lock(); + if (owner_win) XSetTransientForHint( display, data->whole_window, owner_win ); + /* size hints */ set_size_hints( display, data, style );

1 0

Reece Dunn : shlwapi/tests: Skip SHCreateStreamOnFileA/ W configurations not supported on Win98 SE.
by Alexandre Julliard 23 Feb '10

23 Feb '10

Module: wine Branch: master Commit: 1571337c0366b27e819851d7cdec4a7bc1ce7690 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1571337c0366b27e819851d7c… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Tue Feb 23 07:39:05 2010 +0000 shlwapi/tests: Skip SHCreateStreamOnFileA/W configurations not supported on Win98 SE. --- dlls/shlwapi/tests/istream.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/tests/istream.c b/dlls/shlwapi/tests/istream.c index 67d1fe2..9501cd8 100644 --- a/dlls/shlwapi/tests/istream.c +++ b/dlls/shlwapi/tests/istream.c @@ -208,12 +208,16 @@ static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm) /* invalid arguments */ stream = NULL; - /* NT: ERROR_PATH_NOT_FOUND, 9x: ERROR_BAD_PATHNAME */ ret = (*pSHCreateStreamOnFileA)(NULL, mode | stgm, &stream); - ok(ret == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) || - ret == HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME), - "SHCreateStreamOnFileA: expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND)" - "or HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME), got 0x%08x\n", ret); + if (ret == E_INVALIDARG) /* Win98 SE */ { + win_skip("Not supported\n"); + return; + } + + ok(ret == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) /* NT */ || + ret == HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME) /* 9x */, + "SHCreateStreamOnFileA: expected HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND) " + "or HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME), got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileA: expected a NULL IStream object, got %p\n", stream); #if 0 /* This test crashes on WinXP SP2 */ @@ -342,6 +346,11 @@ static void test_SHCreateStreamOnFileW(DWORD mode, DWORD stgm) stream = NULL; ret = (*pSHCreateStreamOnFileW)(test_file, mode | STGM_FAILIFTHERE | stgm, &stream); + if (ret == E_INVALIDARG) /* Win98 SE */ { + win_skip("Not supported\n"); + return; + } + ok(ret == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "SHCreateStreamOnFileW: expected HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), got 0x%08x\n", ret); ok(stream == NULL, "SHCreateStreamOnFileW: expected a NULL IStream object, got %p\n", stream);

1 0

Andrew Nguyen : user32/tests: Fix a failure message trace.
by Alexandre Julliard 23 Feb '10

23 Feb '10

Module: wine Branch: master Commit: 416589a7c2a7ed07345e0f1de0e0037d7fcfa341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=416589a7c2a7ed07345e0f1de… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Tue Feb 23 01:16:26 2010 -0600 user32/tests: Fix a failure message trace. --- dlls/user32/tests/dialog.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index c423f0b..ef4d5dc 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -852,8 +852,8 @@ static void InitialFocusTest (void) ok ((g_hwndInitialFocusT1 == g_hwndButton2), "Error in initial focus when WM_INITDIALOG returned TRUE: " "Expected the second button (%p), got %s (%p).\n", - g_hwndButton2, GetHwndString(g_hwndInitialFocusT2), - g_hwndInitialFocusT2); + g_hwndButton2, GetHwndString(g_hwndInitialFocusT1), + g_hwndInitialFocusT1); ok ((g_hwndInitialFocusT2 == g_hwndButton2), "Error after first SetFocus() when WM_INITDIALOG returned TRUE: "

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
79
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 2010