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

Dmitry Timoshkov : user32: Invalidate a being removed listbox item before deleting it as it' s been done before d2ecb1194102b6d7e6078556f80e58c70ca39c23.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: c293a535c05d5963a9095929e55a0658d342b1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c293a535c05d5963a9095929e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue May 19 15:00:21 2009 +0900 user32: Invalidate a being removed listbox item before deleting it as it's been done before d2ecb1194102b6d7e6078556f80e58c70ca39c23. --- dlls/user32/listbox.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index eaa805b..15aadcb 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1725,14 +1725,14 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; + /* We need to invalidate the original rect instead of the updated one. */ + LISTBOX_InvalidateItems( descr, index ); + descr->nb_items--; LISTBOX_DeleteItem( descr, index ); if (!descr->nb_items) return LB_OKAY; - /* We need to invalidate the original rect instead of the updated one. */ - LISTBOX_InvalidateItems( descr, index ); - /* Remove the item */ item = &descr->items[index];

1 0

Francois Gouget : mstask/tests: Replace realloc() with HeapReAlloc().
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 419ecb35e113d163d449cf128ce3d144854efef0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=419ecb35e113d163d449cf128… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 19 11:20:57 2009 +0200 mstask/tests: Replace realloc() with HeapReAlloc(). --- dlls/mstask/tests/task.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 328dd76..a0a851a 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -38,7 +38,11 @@ static char *get_tmp_space(int size) int idx; idx = ++pos % (sizeof(list)/sizeof(list[0])); - if ((ret = realloc(list[idx], size))) + if (list[idx]) + ret = HeapReAlloc( GetProcessHeap(), 0, list[idx], size ); + else + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) list[idx] = ret; return ret; }

1 0

Michael Stefaniuc : urlmon: Move 'inline' right after the storage specifier .
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 441bc63538340d3b15d00939eb420a8cde30ad6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=441bc63538340d3b15d00939e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 18 21:07:41 2009 +0200 urlmon: Move 'inline' right after the storage specifier. --- dlls/urlmon/bindprot.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 74788c1..eceb7e3 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -214,7 +214,7 @@ static void push_task(BindProtocol *This, task_header_t *task, task_proc_t proc) } } -static BOOL inline do_direct_notif(BindProtocol *This) +static inline BOOL do_direct_notif(BindProtocol *This) { return !(This->pi & PI_APARTMENTTHREADED) || (This->apartment_thread == GetCurrentThreadId() && !This->continue_call); }

1 0

Michael Stefaniuc : notepad: The UNICODE define isn't needed anymore; remove it.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: f66b600449beb774d915bb927ec482044956be40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f66b600449beb774d915bb927… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 18 21:09:25 2009 +0200 notepad: The UNICODE define isn't needed anymore; remove it. Add the WINE_NO_UNICODE_MACROS define to prevent the AW form of functions and types from creeping back in. --- programs/notepad/Makefile.in | 2 +- programs/notepad/dialog.c | 2 -- programs/notepad/main.c | 2 -- 3 files changed, 1 insertions(+), 5 deletions(-) diff --git a/programs/notepad/Makefile.in b/programs/notepad/Makefile.in index a44fe71..fcdc872 100644 --- a/programs/notepad/Makefile.in +++ b/programs/notepad/Makefile.in @@ -7,7 +7,7 @@ APPMODE = -mwindows -mno-cygwin IMPORTS = comdlg32 shell32 shlwapi user32 gdi32 advapi32 kernel32 EXTRAINCL = -I$(TOPSRCDIR)/include/msvcrt MODCFLAGS = @BUILTINFLAG@ -EXTRADEFS = -DNO_LIBWINE_PORT +EXTRADEFS = -DNO_LIBWINE_PORT -DWINE_NO_UNICODE_MACROS C_SRCS = \ dialog.c \ diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index e2328f4..4e56d8e 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -21,8 +21,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define UNICODE - #include <assert.h> #include <stdio.h> #include <windows.h> diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 9f4d6f9..b3c5411 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -22,8 +22,6 @@ * */ -#define UNICODE - #include <windows.h> #include <shlwapi.h> #include <stdio.h>

1 0

Michael Stefaniuc : notepad: Use the more specific MAKEINTRESOURCEW macro.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: f706c68cf91133330fa705c7ed5fc24c83b74dd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f706c68cf91133330fa705c7e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 18 21:07:49 2009 +0200 notepad: Use the more specific MAKEINTRESOURCEW macro. --- programs/notepad/dialog.c | 8 ++++---- programs/notepad/main.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index b028c38..6d8d04c 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -798,8 +798,8 @@ VOID DIALOG_HelpAboutNotepad(VOID) { static const WCHAR notepadW[] = { 'W','i','n','e',' ','N','o','t','e','p','a','d',0 }; WCHAR szNotepad[MAX_STRING_LEN]; - HICON icon = LoadImageW( Globals.hInstance, MAKEINTRESOURCE(IDI_NOTEPAD), - IMAGE_ICON, 48, 48, LR_SHARED ); + HICON icon = LoadImageW(Globals.hInstance, MAKEINTRESOURCEW(IDI_NOTEPAD), + IMAGE_ICON, 48, 48, LR_SHARED); LoadString(Globals.hInstance, STRING_NOTEPAD, szNotepad, SIZEOF(szNotepad)); ShellAbout(Globals.hMainWnd, szNotepad, notepadW, icon); @@ -812,8 +812,8 @@ VOID DIALOG_HelpAboutNotepad(VOID) */ VOID DIALOG_FilePageSetup(void) { - DialogBox(Globals.hInstance, MAKEINTRESOURCE(DIALOG_PAGESETUP), - Globals.hMainWnd, DIALOG_PAGESETUP_DlgProc); + DialogBoxW(Globals.hInstance, MAKEINTRESOURCEW(DIALOG_PAGESETUP), + Globals.hMainWnd, DIALOG_PAGESETUP_DlgProc); } diff --git a/programs/notepad/main.c b/programs/notepad/main.c index 8f7520e..7f987ae 100644 --- a/programs/notepad/main.c +++ b/programs/notepad/main.c @@ -736,10 +736,10 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) class.cbSize = sizeof(class); class.lpfnWndProc = NOTEPAD_WndProc; class.hInstance = Globals.hInstance; - class.hIcon = LoadIcon(Globals.hInstance, MAKEINTRESOURCE(IDI_NOTEPAD)); - class.hCursor = LoadCursor(0, IDC_ARROW); + class.hIcon = LoadIconW(Globals.hInstance, MAKEINTRESOURCEW(IDI_NOTEPAD)); + class.hCursor = LoadCursorW(0, (LPCWSTR)IDC_ARROW); class.hbrBackground = (HBRUSH)(COLOR_WINDOW + 1); - class.lpszMenuName = MAKEINTRESOURCE(MAIN_MENU); + class.lpszMenuName = MAKEINTRESOURCEW(MAIN_MENU); class.lpszClassName = className; if (!RegisterClassEx(&class)) return FALSE; @@ -777,7 +777,7 @@ int PASCAL WinMain(HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show) HandleCommandLine(GetCommandLine()); - hAccel = LoadAccelerators( hInstance, MAKEINTRESOURCE(ID_ACCEL) ); + hAccel = LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(ID_ACCEL)); while (GetMessage(&msg, 0, 0, 0)) {

1 0

Francois Gouget : userenv/tests: Replace realloc() with HeapReAlloc().
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 4d8cf750ff4942ea6aa12aa4a905e17a2988d6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d8cf750ff4942ea6aa12aa4a… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue May 19 11:21:12 2009 +0200 userenv/tests: Replace realloc() with HeapReAlloc(). --- dlls/userenv/tests/userenv.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index d782d2f..83bfda0 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -51,7 +51,11 @@ static char *get_tmp_space( int size ) int idx; idx = ++pos % (sizeof(list)/sizeof(list[0])); - if ((ret = realloc( list[idx], size ))) list[idx] = ret; + if (list[idx]) + ret = HeapReAlloc( GetProcessHeap(), 0, list[idx], size ); + else + ret = HeapAlloc( GetProcessHeap(), 0, size ); + if (ret) list[idx] = ret; return ret; }

1 0

Paul Vriens : wine.inf: Set the correct initial service pack information.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 4626308a2b063b6d8bdd531dd95626e38962ebaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=4626308a2b063b6d8bdd531dd… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon May 18 16:48:16 2009 +0200 wine.inf: Set the correct initial service pack information. --- tools/wine.inf.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index f42dea8..25cec58 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2933,5 +2933,5 @@ HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 2" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"2600" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" -HKLM,%Control%\Windows,"CSDVersion",0x10003,0x400 +HKLM,%Control%\Windows,"CSDVersion",0x10003,0x200 HKLM,%Control%\Session Manager\Environment,"OS",2,"Windows_NT"

1 0

Jacek Caban : urlmon: Use common name for IInternetProtocol and IInternetProtocolSink vtbls.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: e16af65971fefaf419517ecf9a5502da62e8cb23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16af65971fefaf419517ecf9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 18:31:03 2009 +0200 urlmon: Use common name for IInternetProtocol and IInternetProtocolSink vtbls. --- dlls/urlmon/binding.c | 7 +++---- dlls/urlmon/bindprot.c | 26 ++++++++++++-------------- dlls/urlmon/file.c | 7 +++---- dlls/urlmon/ftp.c | 11 +++++------ dlls/urlmon/gopher.c | 9 ++++----- dlls/urlmon/http.c | 11 +++++------ dlls/urlmon/mk.c | 8 +++----- dlls/urlmon/urlmon_main.h | 3 +++ 8 files changed, 38 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e16af65971fefaf419517…

1 0

Jacek Caban : urlmon: Use protocol_handler in Switch implementation.
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: 638c7ac802d48ccff902375bb32447a70fd676b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=638c7ac802d48ccff902375bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 18:30:29 2009 +0200 urlmon: Use protocol_handler in Switch implementation. --- dlls/urlmon/bindprot.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 6da1557..0001fcc 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -822,7 +822,7 @@ static void switch_proc(BindProtocol *bind, task_header_t *t) { switch_task_t *task = (switch_task_t*)t; - IInternetProtocol_Continue(bind->protocol, &task->data); + IInternetProtocol_Continue(bind->protocol_handler, &task->data); heap_free(task); } @@ -851,7 +851,7 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface } if(!This->protocol_sink) { - IInternetProtocol_Continue(This->protocol, pProtocolData); + IInternetProtocol_Continue(This->protocol_handler, pProtocolData); return S_OK; }

1 0

Jacek Caban : urlmon: Use internal IInternetProtocol protocol for communication with pluggable protocol in BindProtocol .
by Alexandre Julliard May 19, 2009

May 19, 2009

Module: wine Branch: master Commit: e5f8427abf9867823e44a9aefcf24f36f88b7429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5f8427abf9867823e44a9aef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 18 18:29:24 2009 +0200 urlmon: Use internal IInternetProtocol protocol for communication with pluggable protocol in BindProtocol. --- dlls/urlmon/bindprot.c | 253 +++++++++++++++++++++++++++++++++++++----------- 1 files changed, 195 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5f8427abf9867823e44a…

1 0