October 2008 - Wine-commits

Huw Davies : ole32: Try to load the '\1Ole' stream and create it if it doesn't exist.
by Alexandre Julliard 28 Oct '08

28 Oct '08

Module: wine Branch: master Commit: b05d392dfb962876e670afe7fbd7fdaf1ca4f930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b05d392dfb962876e670afe7f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 27 15:25:24 2008 +0000 ole32: Try to load the '\1Ole' stream and create it if it doesn't exist. --- dlls/ole32/defaulthandler.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 66d2bff..833e6fd 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1598,6 +1598,42 @@ static void init_ole_stream(IStorage *storage) return; } +static HRESULT load_ole_stream(DefaultHandler *This, IStorage *storage) +{ + IStream *stream; + HRESULT hr; + + hr = IStorage_OpenStream(storage, OleStream, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stream); + + if(SUCCEEDED(hr)) + { + DWORD read; + ole_stream_header_t header; + + hr = IStream_Read(stream, &header, sizeof(header), &read); + if(hr == S_OK && read == sizeof(header) && header.version == ole_stream_version) + { + if(header.flags & 1) + { + /* FIXME: Read the moniker and deal with the link */ + FIXME("Linked objects are not supported yet\n"); + } + } + else + { + WARN("Incorrect OleStream header\n"); + hr = DV_E_CLIPFORMAT; + } + IStream_Release(stream); + } + else + { + init_ole_stream(storage); + hr = S_OK; + } + return hr; +} + /************************************************************************ * DefaultHandler_IPersistStorage_InitNew * @@ -1641,7 +1677,10 @@ static HRESULT WINAPI DefaultHandler_IPersistStorage_Load( TRACE("(%p)->(%p)\n", iface, pStg); - hr = IPersistStorage_Load(This->dataCache_PersistStg, pStg); + hr = load_ole_stream(This, pStg); + + if(SUCCEEDED(hr)) + hr = IPersistStorage_Load(This->dataCache_PersistStg, pStg); if(SUCCEEDED(hr) && object_is_running(This)) hr = IPersistStorage_Load(This->pPSDelegate, pStg);

1 0

Dmitry Timoshkov : wineconsole: Don't ignore extended keys.
by Alexandre Julliard 28 Oct '08

28 Oct '08

Module: wine Branch: master Commit: b8b0b7fa41640bc983479595f9bb337bbdbbd019 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b0b7fa41640bc983479595f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 27 19:14:05 2008 +0800 wineconsole: Don't ignore extended keys. --- programs/wineconsole/user.c | 33 +++++++++++++++------------------ 1 files changed, 15 insertions(+), 18 deletions(-) diff --git a/programs/wineconsole/user.c b/programs/wineconsole/user.c index 01950a3..1c00f31 100644 --- a/programs/wineconsole/user.c +++ b/programs/wineconsole/user.c @@ -1035,26 +1035,23 @@ static void WCUSER_GenerateKeyInputRecord(struct inner_data* data, BOOL down, if (lParam & (1L << 24)) ir.Event.KeyEvent.dwControlKeyState |= ENHANCED_KEY; if (sys) ir.Event.KeyEvent.dwControlKeyState |= LEFT_ALT_PRESSED; /* FIXME: gotta choose one */ - if (!(ir.Event.KeyEvent.dwControlKeyState & ENHANCED_KEY)) + if (down) { - if (down) - { - switch (ToUnicode(wParam, HIWORD(lParam), keyState, buf, 2, 0)) - { - case 2: - /* FIXME... should generate two events... */ - /* fall thru */ - case 1: - last = buf[0]; - break; - default: - last = 0; - break; - } - } - ir.Event.KeyEvent.uChar.UnicodeChar = last; /* FIXME: HACKY... and buggy because it should be a stack, not a single value */ - if (!down) last = 0; + switch (ToUnicode(wParam, HIWORD(lParam), keyState, buf, 2, 0)) + { + case 2: + /* FIXME... should generate two events... */ + /* fall thru */ + case 1: + last = buf[0]; + break; + default: + last = 0; + break; + } } + ir.Event.KeyEvent.uChar.UnicodeChar = last; /* FIXME: HACKY... and buggy because it should be a stack, not a single value */ + if (!down) last = 0; WriteConsoleInput(data->hConIn, &ir, 1, &n); }

1 0

Dmitry Timoshkov : kernel32: Don't ignore extended keys.
by Alexandre Julliard 28 Oct '08

28 Oct '08

Module: wine Branch: master Commit: 67be35304088c916867472ff05114a11d2750881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67be35304088c916867472ff0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 27 19:14:28 2008 +0800 kernel32: Don't ignore extended keys. --- dlls/kernel32/console.c | 3 +-- dlls/kernel32/editline.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index a985060..edaafbc 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -1377,8 +1377,7 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, { if (read_console_input(hConsoleInput, &ir, timeout) != rci_gotone) break; if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown && - ir.Event.KeyEvent.uChar.UnicodeChar && - !(ir.Event.KeyEvent.dwControlKeyState & ENHANCED_KEY)) + ir.Event.KeyEvent.uChar.UnicodeChar) { xbuf[charsread++] = ir.Event.KeyEvent.uChar.UnicodeChar; timeout = 0; diff --git a/dlls/kernel32/editline.c b/dlls/kernel32/editline.c index 0a663cf..6fab049 100644 --- a/dlls/kernel32/editline.c +++ b/dlls/kernel32/editline.c @@ -818,7 +818,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn) /* EPP WCEL_Dump(&ctx, "before func"); */ ofs = ctx.ofs; /* mask out some bits which don't interest us */ - ks = ir.Event.KeyEvent.dwControlKeyState & ~(NUMLOCK_ON|SCROLLLOCK_ON|CAPSLOCK_ON); + ks = ir.Event.KeyEvent.dwControlKeyState & ~(NUMLOCK_ON|SCROLLLOCK_ON|CAPSLOCK_ON|ENHANCED_KEY); func = NULL; for (km = (use_emacs) ? EmacsKeyMap : Win32KeyMap; km->entries != NULL; km++) @@ -845,7 +845,7 @@ WCHAR* CONSOLE_Readline(HANDLE hConsoleIn) if (func) (func)(&ctx); - else if (!(ir.Event.KeyEvent.dwControlKeyState & (ENHANCED_KEY|LEFT_ALT_PRESSED))) + else if (!(ir.Event.KeyEvent.dwControlKeyState & LEFT_ALT_PRESSED)) WCEL_InsertChar(&ctx, ir.Event.KeyEvent.uChar.UnicodeChar); else TRACE("Dropped event\n");

1 0

Nicolas Le Cam : msi/tests: Fix a failing test on all platforms up to and including win2k.
by Alexandre Julliard 28 Oct '08

28 Oct '08

Module: wine Branch: master Commit: cec5d3f5149459225b1c80319c616a9adcebf7f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cec5d3f5149459225b1c80319… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Mon Oct 27 14:16:33 2008 +0100 msi/tests: Fix a failing test on all platforms up to and including win2k. --- dlls/msi/tests/db.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 961aa5a..3561eeb 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -6860,15 +6860,13 @@ static void test_dbmerge(void) r = run_query(hdb, 0, query); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - create_file_data("codepage.idt", "\r\n\r\n28603\t_ForceCodepage\r\n", 0); + create_file_data("codepage.idt", "\r\n\r\n850\t_ForceCodepage\r\n", 0); GetCurrentDirectoryA(MAX_PATH, buf); r = MsiDatabaseImportA(hdb, buf, "codepage.idt"); todo_wine { - ok(r == ERROR_SUCCESS || - broken(r == ERROR_FUNCTION_FAILED), /* win9x */ - "Expected ERROR_SUCCESS, got %d\n", r); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); } query = "DROP TABLE `One`";

1 0

Dmitry Timoshkov : gdi32: Move DC mapping APIs to the 'dc' debug channel.
by Alexandre Julliard 28 Oct '08

28 Oct '08

Module: wine Branch: master Commit: 61900098b16181e6da3867e0986a526088d63b11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61900098b16181e6da3867e09… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 27 22:00:26 2008 +0800 gdi32: Move DC mapping APIs to the 'dc' debug channel. --- dlls/gdi32/mapping.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/mapping.c b/dlls/gdi32/mapping.c index c5ea270..cc82fc2 100644 --- a/dlls/gdi32/mapping.c +++ b/dlls/gdi32/mapping.c @@ -27,7 +27,7 @@ #include "gdi_private.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(gdi); +WINE_DEFAULT_DEBUG_CHANNEL(dc); /***********************************************************************

1 0

Detlef Riekenberg : user32/tests: Avoid crash on win9x.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: de267347c555d5420e0a91ee361b3f44f7d25212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de267347c555d5420e0a91ee3… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Oct 26 23:08:50 2008 +0100 user32/tests: Avoid crash on win9x. --- dlls/user32/tests/win.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 76ca103..6e41100 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4768,14 +4768,20 @@ static void test_GetWindowModuleFileName(void) static void test_hwnd_message(void) { + static const WCHAR mainwindowclassW[] = {'M','a','i','n','W','i','n','d','o','w','C','l','a','s','s',0}; + static const WCHAR message_windowW[] = {'m','e','s','s','a','g','e',' ','w','i','n','d','o','w',0}; + HWND parent = 0, hwnd, found; RECT rect; - hwnd = CreateWindowExA(0, "MainWindowClass", "message window", WS_CAPTION | WS_VISIBLE, + /* HWND_MESSAGE is not supported below w2k, but win9x return != 0 + on CreateWindowExA and crash later in the test. + Use UNICODE here to fail on win9x */ + hwnd = CreateWindowExW(0, mainwindowclassW, message_windowW, WS_CAPTION | WS_VISIBLE, 100, 100, 200, 200, HWND_MESSAGE, 0, 0, NULL); if (!hwnd) { - win_skip("CreateWindowExA with parent HWND_MESSAGE failed\n"); + win_skip("CreateWindowExW with parent HWND_MESSAGE failed\n"); return; }

1 0

Reece Dunn : uxtheme: Fixed the todo blocks in the IsThemed tests when theming is inactive.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: d85c3e7c72d0a7ade4104768b5bbd8b12cae5495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d85c3e7c72d0a7ade4104768b… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Mon Oct 27 09:04:48 2008 +0000 uxtheme: Fixed the todo blocks in the IsThemed tests when theming is inactive. --- dlls/uxtheme/system.c | 1 + dlls/uxtheme/tests/system.c | 14 ++++++-------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index f2c24ae..3630a6d 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -566,6 +566,7 @@ BOOL WINAPI IsAppThemed(void) BOOL WINAPI IsThemeActive(void) { TRACE("\n"); + SetLastError(ERROR_SUCCESS); return bThemeActive; } diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index b82472b..df20885 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -85,10 +85,9 @@ static void test_IsThemed(void) SetLastError(0xdeadbeef); bThemeActive = pIsThemeActive(); trace("Theming is %s\n", (bThemeActive) ? "active" : "inactive"); - todo_wine - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); /* This test is not themed */ SetLastError(0xdeadbeef); @@ -101,10 +100,9 @@ static void test_IsThemed(void) /* Although Wine currently returns FALSE, the logic behind it is wrong. It is not a todo_wine though in the testing sense */ ok( bAppThemed == FALSE, "Expected FALSE as this test executable is not (yet) themed.\n"); - todo_wine - ok( GetLastError() == ERROR_SUCCESS, - "Expected ERROR_SUCCESS, got 0x%08x\n", - GetLastError()); + ok( GetLastError() == ERROR_SUCCESS, + "Expected ERROR_SUCCESS, got 0x%08x\n", + GetLastError()); SetLastError(0xdeadbeef); bTPDefined = pIsThemePartDefined(NULL, 0 , 0);

1 0

Reece Dunn : winecfg: Renamed 'Shell Folder' to 'Folder'.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: 20d8e4685853ed1b3ea433b90b6bf220d3b56a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20d8e4685853ed1b3ea433b90… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Fri Oct 24 20:14:43 2008 +0100 winecfg: Renamed 'Shell Folder' to 'Folder'. --- programs/winecfg/En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index b9575b2..c93bfa9 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -197,7 +197,7 @@ BEGIN EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASS,UDS_SETBUDDYINT | WS_DISABLED,187,74,15,13 PUSHBUTTON "&Font...",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED - GROUPBOX " S&hell Folder ",IDC_STATIC,8,114,244,100 + GROUPBOX " Fol&ders ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 CONTROL "&Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 @@ -223,7 +223,7 @@ BEGIN IDS_THEMEFILE "Theme files" IDS_THEMEFILE_SELECT "Select a theme file" IDS_AUDIO_MISSING "There is no audio driver currently specified in the registry.\n\nA recommended driver has been selected for you.\nYou can use this driver or select another driver if available.\n\nYou must click Apply for the selection to take effect." - IDS_SHELL_FOLDER "Shell Folder" + IDS_SHELL_FOLDER "Folder" IDS_LINKS_TO "Links to" END

1 0

Reece Dunn : winecfg: Add ellipsis ('...') to buttons that launch other dialogs.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: bd645a8482eb4f68e4b4c7471dd5b284bce6e9e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd645a8482eb4f68e4b4c7471… Author: Reece Dunn <msclrhd(a)googlemail.com> Date: Fri Oct 24 20:11:14 2008 +0100 winecfg: Add ellipsis ('...') to buttons that launch other dialogs. --- programs/winecfg/En.rc | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 1a07d71..b9575b2 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -102,7 +102,7 @@ BEGIN PUSHBUTTON "&Add",IDC_DLLS_ADDDLL, 164,68,82,13,BS_DEFPUSHBUTTON LTEXT "Existing &overrides:",IDC_STATIC,16,86,100,8 LISTBOX IDC_DLLS_LIST,16,96,140,140,WS_BORDER | WS_TABSTOP | WS_VSCROLL - PUSHBUTTON "&Edit",IDC_DLLS_EDITDLL,164,96,82,14 + PUSHBUTTON "&Edit...",IDC_DLLS_EDITDLL,164,96,82,14 PUSHBUTTON "&Remove",IDC_DLLS_REMOVEDLL,164,114,82,14 END @@ -196,13 +196,13 @@ BEGIN LTEXT "Si&ze:",IDC_SYSPARAM_SIZE_TEXT,166,64,30,8,WS_DISABLED EDITTEXT IDC_SYSPARAM_SIZE,166,74,23,13,ES_AUTOHSCROLL | WS_TABSTOP | WS_DISABLED CONTROL "",IDC_SYSPARAM_SIZE_UD,UPDOWN_CLASS,UDS_SETBUDDYINT | WS_DISABLED,187,74,15,13 - PUSHBUTTON "&Font",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED + PUSHBUTTON "&Font...",IDC_SYSPARAM_FONT,208,74,37,13,WS_DISABLED GROUPBOX " S&hell Folder ",IDC_STATIC,8,114,244,100 CONTROL "Listview",IDC_LIST_SFPATHS,"SysListView32",LVS_REPORT | LVS_AUTOARRANGE | LVS_ALIGNLEFT | LVS_SINGLESEL | WS_BORDER | WS_TABSTOP, 15,126,230,64 CONTROL "&Link to:",IDC_LINK_SFPATH,"Button",BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED,15,195,50,13 - EDITTEXT IDC_EDIT_SFPATH,65,195,145,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED - PUSHBUTTON "B&rowse",IDC_BROWSE_SFPATH,215,195,30,13,WS_DISABLED + EDITTEXT IDC_EDIT_SFPATH,65,195,125,13,ES_AUTOHSCROLL|WS_TABSTOP|WS_DISABLED + PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED END STRINGTABLE DISCARDABLE

1 0

Alexandre Julliard : ntdll: Make sure the last relocation contains some data.
by Alexandre Julliard 27 Oct '08

27 Oct '08

Module: wine Branch: master Commit: eaae717ede28d155937fdab12f35a9b33f2ca00e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaae717ede28d155937fdab12… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 27 13:19:30 2008 +0100 ntdll: Make sure the last relocation contains some data. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 78e38dc..527dedd 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1108,7 +1108,7 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz end = (IMAGE_BASE_RELOCATION *)(ptr + relocs->VirtualAddress + relocs->Size); delta = ptr - base; - while (rel <= end - 1 && rel->SizeOfBlock) + while (rel < end - 1 && rel->SizeOfBlock) { if (rel->VirtualAddress >= total_size) {

1 0