October 2007 - Wine-commits

Alexandre Julliard : server: Add a default access mapping function for files, and use it for devices too.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 24001e8ddcf353b80a405f974c93c7599a27761e URL: http://source.winehq.org/git/wine.git/?a=commit;h=24001e8ddcf353b80a405f974… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 14:20:15 2007 +0200 server: Add a default access mapping function for files, and use it for devices too. --- server/change.c | 12 +----------- server/device.c | 2 +- server/directory.c | 14 ++------------ server/fd.c | 10 ++++++++++ server/file.c | 10 ++-------- server/file.h | 1 + server/named_pipe.c | 16 ++-------------- server/serial.c | 12 +----------- server/sock.c | 12 +----------- 9 files changed, 21 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24001e8ddcf353b80a405…

1 0

Alexandre Julliard : imagehlp: Fixed UpdateDebugInfoFile definition.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 9fd70324625676542746b8e156df8bf9fc294c37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd70324625676542746b8e15… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 14:58:10 2007 +0200 imagehlp: Fixed UpdateDebugInfoFile definition. --- dlls/imagehlp/modify.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c index 8d1710a..02636bd 100644 --- a/dlls/imagehlp/modify.c +++ b/dlls/imagehlp/modify.c @@ -327,7 +327,7 @@ BOOL WINAPI SplitSymbols( */ BOOL WINAPI UpdateDebugInfoFile( PCSTR ImageFileName, PCSTR SymbolPath, - PSTR DebugFilePath, PIMAGE_NT_HEADERS NtHeaders) + PSTR DebugFilePath, PIMAGE_NT_HEADERS32 NtHeaders) { FIXME("(%s, %s, %s, %p): stub\n", debugstr_a(ImageFileName), debugstr_a(SymbolPath),

1 0

Alexandre Julliard : user32/tests: Replace GWL_WNDPROC by GWLP_WNDPROC.
by Alexandre Julliard 03 Oct '07

03 Oct '07

Module: wine Branch: master Commit: 5bd4038f6e4522cba6067083a4f844f763369072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bd4038f6e4522cba6067083a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 15:01:29 2007 +0200 user32/tests: Replace GWL_WNDPROC by GWLP_WNDPROC. --- dlls/user32/tests/class.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 7f54e2f..a988083 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -636,7 +636,7 @@ static void test_defwndproc(void) ok(IsWindowUnicode(hwnd), "Windows should have remained Unicode\n"); ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcW, "Invalid ANSI winproc\n"); ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)pDefWindowProcA, "Invalid Unicode winproc\n"); - SetWindowLongPtrA(hwnd, GWL_WNDPROC, (LONG_PTR)ClassTest_WndProc); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)ClassTest_WndProc); ok(IsWindowUnicode(hwnd) == FALSE, "SetWindowLongPtrA should have switched window to ANSI\n"); DestroyWindow(hwnd); @@ -654,9 +654,9 @@ static void test_defwndproc(void) hwnd = CreateWindowExW(0, classW, NULL, WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, CW_USEDEFAULT, 680, 260, NULL, NULL, GetModuleHandleA(NULL), 0); ok(IsWindowUnicode(hwnd) == FALSE, "Window should be ANSI\n"); - SetWindowLongPtrW(hwnd, GWL_WNDPROC, (LONG_PTR)ClassTest_WndProc); + SetWindowLongPtrW(hwnd, GWLP_WNDPROC, (LONG_PTR)ClassTest_WndProc); ok(IsWindowUnicode(hwnd), "SetWindowLongPtrW should have changed window to Unicode\n"); - SetWindowLongPtrA(hwnd, GWL_WNDPROC, (LONG_PTR)ClassTest_WndProc); + SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)ClassTest_WndProc); ok(IsWindowUnicode(hwnd) == FALSE, "SetWindowLongPtrA should have changed window to ANSI\n"); DestroyWindow(hwnd);

1 0

Jeremy Newman : typo
by Jeremy Newman 02 Oct '07

02 Oct '07

Module: website Branch: master Commit: 2df28a106d03857fda87698b55192c512286b9a2 URL: http://source.winehq.org/git/website.git/?a=commit;h=2df28a106d03857fda8769… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Oct 2 10:33:19 2007 -0500 typo --- news/2007100201.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/news/2007100201.xml b/news/2007100201.xml index 126127b..759315d 100644 --- a/news/2007100201.xml +++ b/news/2007100201.xml @@ -18,7 +18,7 @@ and <a href="http://www.codeweavers.com/products/cxoffice/change_log/">Linux</a> CrossOver is a commercial version of Wine by CodeWeavers that allows users to <a href="http://www.codeweavers.com/products/support_wine/">support Wine</a>. You can -find out more about this release in the by reading the +find out more about this release by reading the <a href="http://crossover.codeweavers.com/pipermail/announce/2007-October/000039.html">official announcement</a>. There is also a fun <a href="http://www.youtube.com/watch?v=VCd5CQB914w">promotional video</a> out comparing the performance of Wine versus our competitors.

1 0

Jeremy Newman : news about CrossOver 6.2 release
by Jeremy Newman 02 Oct '07

02 Oct '07

Module: website Branch: master Commit: 80b79c954a8c154097169ea5c54040db74aff7a1 URL: http://source.winehq.org/git/website.git/?a=commit;h=80b79c954a8c154097169e… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Tue Oct 2 10:31:32 2007 -0500 news about CrossOver 6.2 release --- news/2007100201.xml | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/news/2007100201.xml b/news/2007100201.xml new file mode 100644 index 0000000..126127b --- /dev/null +++ b/news/2007100201.xml @@ -0,0 +1,31 @@ +<news> +<date>October 2, 2007</date> +<title>CrossOver 6.2 Released</title> +<body> + +CrossOver 6.2 was released by <a href="http://www.codeweavers.com/">CodeWeavers</a> today, +with the following changes: + +<ul> +<li>Added support for Team Fortress 2.</li> +<li>Many improvements to Outlook 2003.</li> +<li>Added a dock presence for running Applications.</li> +<li>Dramatic improvements in performance on OS X Leopard.</li> +<li>many other <a href="http://www.codeweavers.com/products/cxmac/change_log/">Mac OS X</a> +and <a href="http://www.codeweavers.com/products/cxoffice/change_log/">Linux</a> fixes</a>.</li> +</ul> + + +CrossOver is a commercial version of Wine by CodeWeavers that allows +users to <a href="http://www.codeweavers.com/products/support_wine/">support Wine</a>. You can +find out more about this release in the by reading the +<a href="http://crossover.codeweavers.com/pipermail/announce/2007-October/000039.html">official announcement</a>. +There is also a fun <a href="http://www.youtube.com/watch?v=VCd5CQB914w">promotional video</a> out comparing the +performance of Wine versus our competitors. + + +There are <a href="http://www.codeweavers.com/products/download_trial/">free trials</a> available for download +for both Mac OS X and Linux. + +</body> +</news>

1 0

Alexandre Julliard : kernel32: Improve tracing in GlobalAlloc.
by Alexandre Julliard 02 Oct '07

02 Oct '07

Module: wine Branch: master Commit: 4a5ba4c732394b06b33351685b02c65f1f5b4a64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5ba4c732394b06b33351685… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 13:31:59 2007 +0200 kernel32: Improve tracing in GlobalAlloc. --- dlls/kernel32/heap.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index c3598af..587499a 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -356,11 +356,10 @@ HGLOBAL WINAPI GlobalAlloc( else hpflags=0; - TRACE("() flags=%04x\n", flags ); - if((flags & GMEM_MOVEABLE)==0) /* POINTER */ { palloc=HeapAlloc(GetProcessHeap(), hpflags, size); + TRACE( "(flags=%04x) returning %p\n", flags, palloc ); return (HGLOBAL) palloc; } else /* HANDLE */ @@ -399,7 +398,10 @@ HGLOBAL WINAPI GlobalAlloc( } RtlUnlockHeap(GetProcessHeap()); - return pintern ? INTERN_TO_HANDLE(pintern) : 0; + if (!pintern) return 0; + TRACE( "(flags=%04x) returning handle %p pointer %p\n", + flags, INTERN_TO_HANDLE(pintern), pintern->Pointer ); + return INTERN_TO_HANDLE(pintern); } }

1 0

Marcus Meissner : mpr: Initialize lpwSystem.
by Alexandre Julliard 02 Oct '07

02 Oct '07

Module: wine Branch: master Commit: 64920b51768bddf0c33adba7ed324d65e5ae6f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=64920b51768bddf0c33adba7e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 2 11:28:52 2007 +0200 mpr: Initialize lpwSystem. --- dlls/mpr/wnet.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mpr/wnet.c b/dlls/mpr/wnet.c index 16ac984..2fc8792 100644 --- a/dlls/mpr/wnet.c +++ b/dlls/mpr/wnet.c @@ -1319,7 +1319,7 @@ DWORD WINAPI WNetGetResourceInformationA( LPNETRESOURCEA lpNetResource, } if (ret == WN_SUCCESS) { - LPWSTR lpSystemW; + LPWSTR lpSystemW = NULL; LPVOID lpBufferW; size = 1024; lpBufferW = HeapAlloc(GetProcessHeap(), 0, size);

1 0

Marcus Meissner : pdh: Removed superflous NULL ptr check.
by Alexandre Julliard 02 Oct '07

02 Oct '07

Module: wine Branch: master Commit: b59153997e28a445511743cf9c529650d066f056 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b59153997e28a445511743cf9… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Oct 2 11:32:37 2007 +0200 pdh: Removed superflous NULL ptr check. --- dlls/pdh/pdh_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index c5117bf..49d0a33 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -482,7 +482,7 @@ static DWORD CALLBACK collect_query_thread( void *arg ) if (WaitForSingleObject( stop, interval ) != WAIT_TIMEOUT) ExitThread( 0 ); EnterCriticalSection( &pdh_handle_cs ); - if (!query || query->magic != PDH_MAGIC_QUERY) + if (query->magic != PDH_MAGIC_QUERY) { LeaveCriticalSection( &pdh_handle_cs ); ExitThread( PDH_INVALID_HANDLE );

1 0

Dmitry Timoshkov : user32: Add a message test for ownerdrawn listbox, make it pass under Wine.
by Alexandre Julliard 02 Oct '07

02 Oct '07

Module: wine Branch: master Commit: 5a218e97affb928d5d7d4eba8d89670d4603769f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a218e97affb928d5d7d4eba8… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Oct 2 19:08:15 2007 +0900 user32: Add a message test for ownerdrawn listbox, make it pass under Wine. --- dlls/user32/listbox.c | 5 +- dlls/user32/tests/msg.c | 147 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 150 insertions(+), 2 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index e2bf43b..fad5a48 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1417,7 +1417,8 @@ static LRESULT LISTBOX_SelectItemRange( LB_DESCR *descr, INT first, static LRESULT LISTBOX_SetSelection( LB_DESCR *descr, INT index, BOOL on, BOOL send_notify ) { - TRACE( "index=%d notify=%s\n", index, send_notify ? "YES" : "NO" ); + TRACE( "cur_sel=%d index=%d notify=%s\n", + descr->selected_item, index, send_notify ? "YES" : "NO" ); if (descr->style & LBS_NOSEL) { @@ -2899,7 +2900,7 @@ static LRESULT WINAPI ListBoxWndProc_common( HWND hwnd, UINT msg, /* fall through */ case LB_SETCURSEL: if (IS_MULTISELECT(descr)) return LB_ERR; - LISTBOX_SetCaretIndex( descr, wParam, TRUE ); + LISTBOX_SetCaretIndex( descr, wParam, FALSE ); ret = LISTBOX_SetSelection( descr, wParam, TRUE, FALSE ); if (lphc && ret != LB_ERR) ret = descr->selected_item; return ret; diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0d47262..527f4c2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -51,6 +51,23 @@ #define WND_POPUP_ID 2 #define WND_CHILD_ID 3 +/* encoded DRAWITEMSTRUCT into an LPARAM */ +typedef struct +{ + union + { + struct + { + UINT type : 4; /* ODT_* flags */ + UINT ctl_id : 4; /* Control ID */ + UINT item_id : 4; /* Menu item ID */ + UINT action : 4; /* ODA_* flags */ + UINT state : 16; /* ODS_* flags */ + } item; + LPARAM lp; + }; +} DRAW_ITEM_STRUCT; + static BOOL test_DestroyWindow_flag; static HWINEVENTHOOK hEvent_hook; @@ -6235,6 +6252,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam message == WM_PARENTNOTIFY || message == WM_CANCELMODE || message == WM_SETFOCUS || message == WM_KILLFOCUS || message == WM_ENABLE || message == WM_ENTERIDLE || + message == WM_DRAWITEM || message == WM_IME_SETCONTEXT) { switch (message) @@ -6275,6 +6293,25 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam wParam &= ~(SWP_NOZORDER); break; } + + case WM_DRAWITEM: + { + /* encode DRAWITEMSTRUCT into an LPARAM */ + DRAW_ITEM_STRUCT di; + DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam; + + trace("WM_DRAWITEM: type %x, ctl_id %x, item_id %x, action %x, state %x\n", + dis->CtlType, dis->CtlID, dis->itemID, dis->itemAction, dis->itemState); + + di.item.type = dis->CtlType; + di.item.ctl_id = dis->CtlID; + di.item.item_id = dis->itemID; + di.item.action = dis->itemAction; + di.item.state = dis->itemState; + + lParam = di.lp; + break; + } } msg.message = message; @@ -6604,6 +6641,7 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) !lstrcmpiA(buf, "my_button_class") || !lstrcmpiA(buf, "my_edit_class") || !lstrcmpiA(buf, "static") || + !lstrcmpiA(buf, "ListBox") || !lstrcmpiA(buf, "MyDialogClass") || !lstrcmpiA(buf, "#32770")) { @@ -6651,6 +6689,7 @@ static void CALLBACK win_event_proc(HWINEVENTHOOK hevent, !lstrcmpiA(buf, "my_button_class") || !lstrcmpiA(buf, "my_edit_class") || !lstrcmpiA(buf, "static") || + !lstrcmpiA(buf, "ListBox") || !lstrcmpiA(buf, "MyDialogClass") || !lstrcmpiA(buf, "#32770")) { @@ -9702,6 +9741,113 @@ static void test_dbcs_wm_char(void) DestroyWindow(hwnd); } +#define ID_LISTBOX 0x000f + +static const struct message wm_lb_setcursel_0[] = +{ + { LB_SETCURSEL, sent|wparam|lparam, 0, 0 }, + { WM_CTLCOLORLISTBOX, sent|parent }, + { WM_DRAWITEM, sent|wparam|lparam|parent, ID_LISTBOX, 0x00120f2 }, + { 0 } +}; +static const struct message wm_lb_setcursel_1[] = +{ + { LB_SETCURSEL, sent|wparam|lparam, 1, 0 }, + { WM_CTLCOLORLISTBOX, sent|parent }, + { WM_DRAWITEM, sent|wparam|lparam|parent, ID_LISTBOX, 0x00020f2 }, + { WM_CTLCOLORLISTBOX, sent|parent }, + { WM_DRAWITEM, sent|wparam|lparam|parent, ID_LISTBOX, 0x00121f2 }, + { 0 } +}; + +#define check_lb_state(a1, a2, a3, a4, a5) check_lb_state_dbg(a1, a2, a3, a4, a5, __LINE__) + +static LRESULT (WINAPI *listbox_orig_proc)(HWND, UINT, WPARAM, LPARAM); + +static LRESULT WINAPI listbox_hook_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp) +{ + struct message msg; + + /* do not log painting messages */ + if (message != WM_PAINT && + message != WM_NCPAINT && + message != WM_SYNCPAINT && + message != WM_ERASEBKGND && + message != WM_NCHITTEST && + message != WM_GETTEXT && + message != WM_GETICON && + message != WM_DEVICECHANGE) + { + trace("listbox: %p, %04x, %08lx, %08lx\n", hwnd, message, wp, lp); + + msg.message = message; + msg.flags = sent|wparam|lparam; + msg.wParam = wp; + msg.lParam = lp; + add_message(&msg); + } + + return CallWindowProcA(listbox_orig_proc, hwnd, message, wp, lp); +} + +static void check_lb_state_dbg(HWND listbox, int count, int cur_sel, + int caret_index, int top_index, int line) +{ + LRESULT ret; + + ret = SendMessage(listbox, LB_GETCOUNT, 0, 0); + ok_(__FILE__, line)(ret == count, "expected count %d, got %ld\n", count, ret); + ret = SendMessage(listbox, LB_GETCURSEL, 0, 0); + ok_(__FILE__, line)(ret == cur_sel, "expected cur sel %d, got %ld\n", cur_sel, ret); + ret = SendMessage(listbox, LB_GETCARETINDEX, 0, 0); + ok_(__FILE__, line)(ret == caret_index, "expected caret index %d, got %ld\n", caret_index, ret); + ret = SendMessage(listbox, LB_GETTOPINDEX, 0, 0); + ok_(__FILE__, line)(ret == top_index, "expected top index %d, got %ld\n", top_index, ret); +} + +static void test_listbox(void) +{ + HWND parent, listbox; + LRESULT ret; + + parent = CreateWindowExA(0, "TestParentClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + listbox = CreateWindowExA(WS_EX_NOPARENTNOTIFY, "ListBox", NULL, + WS_CHILD | LBS_NOTIFY | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | WS_VISIBLE, + 10, 10, 80, 20, parent, (HMENU)ID_LISTBOX, 0, NULL); + listbox_orig_proc = (WNDPROC)SetWindowLongPtrA(listbox, GWLP_WNDPROC, (ULONG_PTR)listbox_hook_proc); + + check_lb_state(listbox, 0, LB_ERR, 0, 0); + + ret = SendMessage(listbox, LB_ADDSTRING, 0, (LPARAM)"item 1"); + ok(ret == 0, "expected 0, got %ld\n", ret); + ret = SendMessage(listbox, LB_ADDSTRING, 0, (LPARAM)"item 2"); + ok(ret == 1, "expected 1, got %ld\n", ret); + ret = SendMessage(listbox, LB_ADDSTRING, 0, (LPARAM)"item 3"); + ok(ret == 2, "expected 2, got %ld\n", ret); + + check_lb_state(listbox, 3, LB_ERR, 0, 0); + + flush_sequence(); + + log_all_parent_messages++; + + trace("selecting item 0\n"); + SendMessage(listbox, LB_SETCURSEL, 0, 0); + ok_sequence(wm_lb_setcursel_0, "LB_SETCURSEL 0", FALSE ); + check_lb_state(listbox, 3, 0, 0, 0); + flush_sequence(); + + trace("selecting item 1\n"); + SendMessage(listbox, LB_SETCURSEL, 1, 0); + ok_sequence(wm_lb_setcursel_1, "LB_SETCURSEL 1", FALSE ); + check_lb_state(listbox, 3, 1, 1, 0); + + log_all_parent_messages--; + + DestroyWindow(parent); +} + START_TEST(msg) { BOOL ret; @@ -9779,6 +9925,7 @@ START_TEST(msg) test_nullCallback(); test_SetForegroundWindow(); test_dbcs_wm_char(); + test_listbox(); UnhookWindowsHookEx(hCBT_hook); if (pUnhookWinEvent)

1 0

Chris Spencer : wine.inf: Create psapi.dll as a fake dll.
by Alexandre Julliard 02 Oct '07

02 Oct '07

Module: wine Branch: master Commit: 3e76083bd1feeb15b7f2fc4a38550124ed268af5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e76083bd1feeb15b7f2fc4a3… Author: Chris Spencer <spencercw(a)googlemail.com> Date: Mon Oct 1 17:34:55 2007 +0100 wine.inf: Create psapi.dll as a fake dll. --- tools/wine.inf | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf b/tools/wine.inf index cfad301..2676f16 100644 --- a/tools/wine.inf +++ b/tools/wine.inf @@ -2230,6 +2230,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,olepro32.dll 11,,opengl32.dll 11,,progman.exe +11,,psapi.dll 11,,quartz.dll 11,,regsvr32.exe 11,,riched20.dll

1 0