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

Dan Hipschman : rpcrt4: Fix test typo.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: b4e8073f8cceb1a5a1376253e24e6e6347ee16ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4e8073f8cceb1a5a1376253e… Author: Dan Hipschman <dsh(a)linux.ucla.edu> Date: Thu May 24 17:47:22 2007 -0700 rpcrt4: Fix test typo. --- dlls/rpcrt4/tests/server.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index da2bf5e..016088a 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -279,8 +279,8 @@ union_tests(void) sun.u.f = 5.0; ok(square_sun(&sun) == 25.0, "RPC square_sun\n"); - sun.s = SUN_I; - sun.u.i = -2.0; + sun.s = SUN_F2; + sun.u.f = -2.0; ok(square_sun(&sun) == 4.0, "RPC square_sun\n"); }

1 0

James Hawkins : msi: Add the ability to deformat the component's source.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: ea2c96c5dfb42a5efceeaf6d044953b93a2de5f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea2c96c5dfb42a5efceeaf6d0… Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 24 11:11:20 2007 -0700 msi: Add the ability to deformat the component's source. --- dlls/msi/format.c | 5 +++-- dlls/msi/tests/format.c | 5 +---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index fa85e60..1bcfa6e 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -113,16 +113,17 @@ static LPWSTR deformat_component(MSIPACKAGE* package, LPCWSTR key, DWORD* sz) { LPWSTR value = NULL; MSICOMPONENT *comp; + BOOL source; *sz = 0; if (!package) return NULL; - FIXME("component key %s\n", debugstr_w(key)); comp = get_loaded_component(package,key); if (comp) { - value = resolve_folder(package, comp->Directory, FALSE, FALSE, TRUE, NULL); + source = (comp->Action == INSTALLSTATE_SOURCE) ? TRUE : FALSE; + value = resolve_folder(package, comp->Directory, source, FALSE, TRUE, NULL); *sz = (strlenW(value)) * sizeof(WCHAR); } diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 16661e3..23438bb 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -2236,10 +2236,7 @@ static void test_formatrecord_tables(void) MsiRecordSetString( hrec, 1, "[$parietal]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - todo_wine - { - ok( !lstrcmp( buf, expected ), "Expected '%s', got %s\n", expected, buf); - } + ok( !lstrcmp( buf, expected ), "Expected '%s', got %s\n", expected, buf); DeleteFile( "C:\\I am a really long directory\\temporal.txt" ); RemoveDirectory( "C:\\I am a really long directory" );

1 0

Jacek Caban : mshtml: Fixed AsyncOpen implementation for channels without associated document.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: de2e9e13ce839d251f495afc8bc75685f2f47496 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de2e9e13ce839d251f495afc8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 24 19:15:22 2007 +0200 mshtml: Fixed AsyncOpen implementation for channels without associated document. --- dlls/mshtml/nsio.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index a47bb1d..601a300 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -647,7 +647,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen if(do_load_from_moniker_hack(This)) return WINE_NS_LOAD_FROM_MONIKER; - }else if(container->doc) { + }else { BOOL cont = before_async_open(This, container); nsIWebBrowserChrome_Release(NSWBCHROME(container)); @@ -655,11 +655,11 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen TRACE("canceled\n"); return NS_ERROR_UNEXPECTED; } - }else { - nsIWebBrowserChrome_Release(NSWBCHROME(container)); - return This->channel - ? nsIChannel_AsyncOpen(This->channel, aListener, aContext) - : NS_ERROR_UNEXPECTED; + + if(!container->doc) + return This->channel + ? nsIChannel_AsyncOpen(This->channel, aListener, aContext) + : NS_ERROR_UNEXPECTED; } } @@ -1567,7 +1567,7 @@ static nsresult NSAPI nsURI_SetNSContainer(nsIWineURI *iface, NSContainer *aCont if(This->container) { if(This->container == aContainer) return NS_OK; - WARN("Container already set: %p\n", This->container); + TRACE("Changing %p -> %p\n", This->container, aContainer); nsIWebBrowserChrome_Release(NSWBCHROME(This->container)); }

1 0

Jacek Caban : mshtml: Added missing WINAPI in window proc.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 4a71ab79f51896103908ab766a89a493bee911a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a71ab79f51896103908ab766… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 24 19:16:02 2007 +0200 mshtml: Added missing WINAPI in window proc. --- dlls/mshtml/view.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/view.c b/dlls/mshtml/view.c index e0db0b8..79fe399 100644 --- a/dlls/mshtml/view.c +++ b/dlls/mshtml/view.c @@ -248,7 +248,7 @@ static HRESULT activate_window(HTMLDocument *This) return S_OK; } -static LRESULT tooltips_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +static LRESULT WINAPI tooltips_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { tooltip_data *data = GetPropW(hwnd, wszTooltipData);

1 0

James Hawkins : msi: Remove a misleading ERR, as this fails if a file doesn 't exist, which is common.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: f5c2806ca19bfcfe1c7d3002714b4df829a9d650 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c2806ca19bfcfe1c7d30027… Author: James Hawkins <truiken(a)gmail.com> Date: Thu May 24 11:10:44 2007 -0700 msi: Remove a misleading ERR, as this fails if a file doesn't exist, which is common. --- dlls/msi/format.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 2ea6e23..fa85e60 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -162,8 +162,6 @@ static LPWSTR deformat_file(MSIPACKAGE* package, LPCWSTR key, DWORD* sz, } else { - ERR("Unable to get ShortPath size (%s)\n", - debugstr_w( file->TargetPath) ); value = strdupW( file->TargetPath ); *sz = (lstrlenW(value)) * sizeof(WCHAR); }

1 0

Vitaliy Margolen : wine.inf: Create fake dll for iexplore.exe.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 70995ed459e07ad9976cc2c20c28ffa77f46a7d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70995ed459e07ad9976cc2c20… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu May 24 07:50:10 2007 -0600 wine.inf: Create fake dll for iexplore.exe. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index 5d0420d..9a71005 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2212,6 +2212,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,winver.exe 11,,ws2_32.dll 11,,wsock32.dll +16422,Internet Explorer,iexplore.exe [SystemIni] system.ini, mci,,"MPEGVideo=mciqtz.drv"

1 0

Detlef Riekenberg : localui/tests: Add tests for AddPortUI.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 189719c1bb79ad3e15a7d6ff0183c283a64dda84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=189719c1bb79ad3e15a7d6ff0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu May 24 17:27:51 2007 +0200 localui/tests: Add tests for AddPortUI. --- dlls/localui/tests/localui.c | 57 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/localui/tests/localui.c b/dlls/localui/tests/localui.c index 414d8d3..7965d3c 100644 --- a/dlls/localui/tests/localui.c +++ b/dlls/localui/tests/localui.c @@ -48,6 +48,7 @@ static WCHAR does_not_existW[] = {'d','o','e','s','_','n','o','t','_','e','x','i static WCHAR emptyW[] = {0}; static CHAR fmt_comA[] = {'C','O','M','%','u',':',0}; static CHAR fmt_lptA[] = {'L','P','T','%','u',':',0}; +static WCHAR localportW[] = {'L','o','c','a','l',' ','P','o','r','t',0}; static WCHAR portname_fileW[] = {'F','I','L','E',':',0}; static LPBYTE pi_buffer; @@ -123,6 +124,61 @@ static LPWSTR strdupW(LPCWSTR strW) /* ########################### */ +static void test_AddPortUI(void) +{ + DWORD res; + LPWSTR new_portname; + + /* not present before w2k */ + if (!pAddPortUI) { + skip("AddPortUI not found\n"); + return; + } + + SetLastError(0xdeadbeef); + res = pAddPortUI(NULL, NULL, NULL, NULL); + ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), + "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", + res, GetLastError()); + + SetLastError(0xdeadbeef); + res = pAddPortUI(NULL, NULL, emptyW, NULL); + ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), + "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", + res, GetLastError()); + + SetLastError(0xdeadbeef); + res = pAddPortUI(NULL, NULL, does_not_existW, NULL); + ok( !res && (GetLastError() == ERROR_UNKNOWN_PORT), + "got %d with %u (expected '0' with ERROR_UNKNOWN_PORT)\n", + res, GetLastError()); + + if (winetest_interactive) { + SetLastError(0xdeadbeef); + new_portname = NULL; + /* + * - On MSDN, you can read, that no dialogs should be displayed, when hWnd + * is NULL, but native localui does not care + * - when the new port already exist, + * TRUE is returned, but new_portname is NULL + * - when the new port starts with "COM" or "LPT", + * FALSE is returned with ERROR_NOT_SUPPORTED in windows + */ + res = pAddPortUI(NULL, NULL, localportW, &new_portname); + ok( res || + (GetLastError() == ERROR_CANCELLED) || + (GetLastError() == ERROR_ACCESS_DENIED) || + (GetLastError() == ERROR_NOT_SUPPORTED), + "got %d with %u and %p (expected '!= 0' or '0' with: " + "ERROR_CANCELLED, ERROR_ACCESS_DENIED or ERROR_NOT_SUPPORTED)\n", + res, GetLastError(), new_portname); + + GlobalFree(new_portname); + } +} + +/* ########################### */ + static void test_ConfigurePortUI(void) { DWORD res; @@ -255,6 +311,7 @@ START_TEST(localui) /* "FILE:" */ file_present = find_portinfo2(portname_fileW); + test_AddPortUI(); test_ConfigurePortUI(); /* cleanup */

1 0

Dmitry Timoshkov : user32/tests: Fix a problem revealed by compilation in 64-bit mode.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 141673c22292406bbab0b2fe269f1e13592911eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=141673c22292406bbab0b2fe2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 24 17:15:31 2007 +0900 user32/tests: Fix a problem revealed by compilation in 64-bit mode. --- dlls/user32/tests/win.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 632fcc1..9faca35 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -322,7 +322,7 @@ static void test_parent_owner(void) if (0) { /* this test succeeds on NT but crashes on win9x systems */ - ret = (HWND)SetWindowLongA( test, GWL_HWNDPARENT, (LONG_PTR)hwndMain2 ); + ret = (HWND)SetWindowLongPtrA( test, GWLP_HWNDPARENT, (LONG_PTR)hwndMain2 ); ok( !ret, "Set GWL_HWNDPARENT succeeded on desktop\n" ); check_parents( desktop, 0, 0, 0, 0, 0, 0 ); ok( !SetParent( desktop, hwndMain ), "SetParent succeeded on desktop\n" );

1 0

Dmitry Timoshkov : winedbg: Fix a problem revealed by compilation in 64-bit mode.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: e0510e42fe588fb8079c0f378c471cc77cfa88f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0510e42fe588fb8079c0f378… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu May 24 17:15:59 2007 +0900 winedbg: Fix a problem revealed by compilation in 64-bit mode. --- programs/winedbg/be_x86_64.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 3400f72..75dc933 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -51,7 +51,7 @@ static unsigned be_x86_64_get_register_info(int regno, enum be_cpu_addr* kind) /* this is true when running in 32bit mode... and wrong in 64 :-/ */ switch (regno) { - case CV_AMD64_EIP: *kind = be_cpu_addr_pc; return TRUE; + case CV_AMD64_RIP: *kind = be_cpu_addr_pc; return TRUE; case CV_AMD64_EBP: *kind = be_cpu_addr_frame; return TRUE; case CV_AMD64_ESP: *kind = be_cpu_addr_stack; return TRUE; }

1 0

Alexandre Julliard : winebuild: Set the IMAGE_FILE_EXECUTABLE_IMAGE flag for all modules.
by Alexandre Julliard 25 May '07

25 May '07

Module: wine Branch: master Commit: 560113b7438542c031ec1f87783977069f241c75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=560113b7438542c031ec1f877… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 24 12:54:27 2007 +0200 winebuild: Set the IMAGE_FILE_EXECUTABLE_IMAGE flag for all modules. --- tools/winebuild/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 656e375..a251e6f 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -333,7 +333,7 @@ DLLSPEC *alloc_dll_spec(void) spec->alloc_entry_points = 0; spec->nb_names = 0; spec->nb_resources = 0; - spec->characteristics = 0; + spec->characteristics = IMAGE_FILE_EXECUTABLE_IMAGE; spec->dll_characteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT; spec->subsystem = 0; spec->subsystem_major = 4;

1 0