December 2009 - Wine-Commits

Alexandre Julliard : comctl32: Use the module instance instead of that of the owner window for the toolbar configuration dialog .
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 6fd93a6c7e3ca9af51dcc0e161f9d5c9167feb84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fd93a6c7e3ca9af51dcc0e16… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 11:20:19 2009 +0100 comctl32: Use the module instance instead of that of the owner window for the toolbar configuration dialog. --- dlls/comctl32/toolbar.c | 15 ++------------- 1 files changed, 2 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 1cbdd6f..d5ca524 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3156,8 +3156,6 @@ TOOLBAR_Customize (TOOLBAR_INFO *infoPtr) { CUSTDLG_INFO custInfo; LRESULT ret; - LPCVOID template; - HRSRC hRes; NMHDR nmhdr; custInfo.tbInfo = infoPtr; @@ -3166,17 +3164,8 @@ TOOLBAR_Customize (TOOLBAR_INFO *infoPtr) /* send TBN_BEGINADJUST notification */ TOOLBAR_SendNotify (&nmhdr, infoPtr, TBN_BEGINADJUST); - if (!(hRes = FindResourceW (COMCTL32_hModule, - MAKEINTRESOURCEW(IDD_TBCUSTOMIZE), - (LPWSTR)RT_DIALOG))) - return FALSE; - - if(!(template = LoadResource (COMCTL32_hModule, hRes))) - return FALSE; - - ret = DialogBoxIndirectParamW ((HINSTANCE)GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_HINSTANCE), - template, infoPtr->hwndSelf, TOOLBAR_CustomizeDialogProc, - (LPARAM)&custInfo); + ret = DialogBoxParamW (COMCTL32_hModule, MAKEINTRESOURCEW(IDD_TBCUSTOMIZE), + infoPtr->hwndSelf, TOOLBAR_CustomizeDialogProc, (LPARAM)&custInfo); /* send TBN_ENDADJUST notification */ TOOLBAR_SendNotify (&nmhdr, infoPtr, TBN_ENDADJUST);

1 0

Alexandre Julliard : user32: Send all CreateWindow calls through the WoW wrapper to allow mapping 16-bit instances .
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: ce50559013365073dd76ef1169fe42cd91bc2e29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce50559013365073dd76ef116… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 11:21:48 2009 +0100 user32: Send all CreateWindow calls through the WoW wrapper to allow mapping 16-bit instances. --- dlls/user32/controls.h | 3 ++ dlls/user32/msg16.c | 81 ++++++++--------------------------------------- dlls/user32/win.c | 6 ++-- dlls/user32/winproc.c | 1 + dlls/user32/wnd16.c | 60 +++++++++++++++++++++++++++++++++++ 5 files changed, 81 insertions(+), 70 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 3bde456..956c32e 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -96,6 +96,7 @@ struct wow_handlers16 LRESULT (*mdiclient_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*scrollbar_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); LRESULT (*static_proc)(HWND,UINT,WPARAM,LPARAM,BOOL); + HWND (*create_window)(CREATESTRUCTW*,LPCWSTR,HINSTANCE,UINT); LRESULT (*call_window_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); LRESULT (*call_dialog_proc)(HWND,UINT,WPARAM,LPARAM,LRESULT*,void*); }; @@ -123,6 +124,8 @@ extern LRESULT MDIClientWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HI extern LRESULT ScrollBarWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; extern LRESULT StaticWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDEN; +/* 16-bit support */ +extern HWND create_window16(CREATESTRUCTW*,LPCWSTR,HINSTANCE,UINT) DECLSPEC_HIDDEN; extern void register_wow_handlers(void) DECLSPEC_HIDDEN; extern void WINAPI UserRegisterWowHandlers( const struct wow_handlers16 *new, struct wow_handlers32 *orig ); diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index c3365e8..db6de66 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -2000,73 +2000,6 @@ BOOL16 WINAPI TranslateMDISysAccel16( HWND16 hwndClient, LPMSG16 msg ) /*********************************************************************** - * CreateWindowEx (USER.452) - */ -HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className, - LPCSTR windowName, DWORD style, INT16 x, - INT16 y, INT16 width, INT16 height, - HWND16 parent, HMENU16 menu, - HINSTANCE16 instance, LPVOID data ) -{ - CREATESTRUCTA cs; - char buffer[256]; - HWND hwnd; - - /* Fix the coordinates */ - - cs.x = (x == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)x; - cs.y = (y == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)y; - cs.cx = (width == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)width; - cs.cy = (height == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)height; - - /* Create the window */ - - cs.lpCreateParams = data; - cs.hInstance = HINSTANCE_32(instance); - cs.hMenu = HMENU_32(menu); - cs.hwndParent = WIN_Handle32( parent ); - cs.style = style; - cs.lpszName = windowName; - cs.lpszClass = className; - cs.dwExStyle = exStyle; - - /* map to module handle */ - if (instance) instance = GetExePtr( instance ); - - /* load the menu */ - if (!menu && (style & (WS_CHILD | WS_POPUP)) != WS_CHILD) - { - WNDCLASSA class; - - if (GetClassInfoA( HINSTANCE_32(instance), className, &class )) - cs.hMenu = HMENU_32( LoadMenu16( instance, class.lpszMenuName )); - } - - if (!IS_INTRESOURCE(className)) - { - WCHAR bufferW[256]; - - if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) )) - return 0; - hwnd = wow_handlers32.create_window( (CREATESTRUCTW *)&cs, bufferW, - HINSTANCE_32(instance), 0 ); - } - else - { - if (!GlobalGetAtomNameA( LOWORD(className), buffer, sizeof(buffer) )) - { - ERR( "bad atom %x\n", LOWORD(className)); - return 0; - } - cs.lpszClass = buffer; - hwnd = wow_handlers32.create_window( (CREATESTRUCTW *)&cs, (LPCWSTR)className, - HINSTANCE_32(instance), 0 ); - } - return HWND_16( hwnd ); -} - - -/*********************************************************************** * button_proc16 */ static LRESULT button_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) @@ -2642,6 +2575,19 @@ static LRESULT static_proc16( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, } +/*********************************************************************** + * create_window16 + */ +HWND create_window16( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE instance, UINT flags ) +{ + /* map to module handle */ + if (instance && !((ULONG_PTR)instance >> 16)) + instance = HINSTANCE_32( GetExePtr( HINSTANCE_16(instance) )); + + return wow_handlers32.create_window( cs, className, instance, flags ); +} + + void register_wow_handlers(void) { static const struct wow_handlers16 handlers16 = @@ -2653,6 +2599,7 @@ void register_wow_handlers(void) mdiclient_proc16, scrollbar_proc16, static_proc16, + create_window16, call_window_proc_Ato16, call_dialog_proc_Ato16 }; diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 7834501..393c562 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1465,11 +1465,11 @@ HWND WINAPI CreateWindowExA( DWORD exStyle, LPCSTR className, WCHAR bufferW[256]; if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) )) return 0; - return WIN_CreateWindowEx( (CREATESTRUCTW *)&cs, bufferW, instance, WIN_ISWIN32 ); + return wow_handlers.create_window( (CREATESTRUCTW *)&cs, bufferW, instance, WIN_ISWIN32 ); } /* Note: we rely on the fact that CREATESTRUCTA and */ /* CREATESTRUCTW have the same layout. */ - return WIN_CreateWindowEx( (CREATESTRUCTW *)&cs, (LPCWSTR)className, instance, WIN_ISWIN32 ); + return wow_handlers.create_window( (CREATESTRUCTW *)&cs, (LPCWSTR)className, instance, WIN_ISWIN32 ); } @@ -1497,7 +1497,7 @@ HWND WINAPI CreateWindowExW( DWORD exStyle, LPCWSTR className, cs.lpszClass = className; cs.dwExStyle = exStyle; - return WIN_CreateWindowEx( &cs, className, instance, WIN_ISWIN32 | WIN_ISUNICODE ); + return wow_handlers.create_window( &cs, className, instance, WIN_ISWIN32 | WIN_ISUNICODE ); } diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 36f8279..48a9dbe 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1152,6 +1152,7 @@ struct wow_handlers16 wow_handlers = MDIClientWndProc_common, ScrollBarWndProc_common, StaticWndProc_common, + WIN_CreateWindowEx, NULL, /* call_window_proc */ NULL /* call_dialog_proc */ }; diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index 4873be7..ad99e6d 100644 --- a/dlls/user32/wnd16.c +++ b/dlls/user32/wnd16.c @@ -21,6 +21,7 @@ #include "wine/winuser16.h" #include "wownt32.h" #include "win.h" +#include "controls.h" #include "user_private.h" #include "wine/server.h" @@ -1789,6 +1790,65 @@ BOOL16 WINAPI DrawAnimatedRects16( HWND16 hwnd, INT16 idAni, /*********************************************************************** + * CreateWindowEx (USER.452) + */ +HWND16 WINAPI CreateWindowEx16( DWORD exStyle, LPCSTR className, + LPCSTR windowName, DWORD style, INT16 x, + INT16 y, INT16 width, INT16 height, + HWND16 parent, HMENU16 menu, + HINSTANCE16 instance, LPVOID data ) +{ + CREATESTRUCTA cs; + char buffer[256]; + HWND hwnd; + + /* Fix the coordinates */ + + cs.x = (x == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)x; + cs.y = (y == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)y; + cs.cx = (width == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)width; + cs.cy = (height == CW_USEDEFAULT16) ? CW_USEDEFAULT : (INT)height; + + /* Create the window */ + + cs.lpCreateParams = data; + cs.hInstance = HINSTANCE_32(instance); + cs.hMenu = HMENU_32(menu); + cs.hwndParent = WIN_Handle32( parent ); + cs.style = style; + cs.lpszName = windowName; + cs.lpszClass = className; + cs.dwExStyle = exStyle; + + /* load the menu */ + if (!menu && (style & (WS_CHILD | WS_POPUP)) != WS_CHILD) + { + WNDCLASSA class; + HINSTANCE16 module = GetExePtr( instance ); + + if (GetClassInfoA( HINSTANCE_32(module), className, &class )) + cs.hMenu = HMENU_32( LoadMenu16( module, class.lpszMenuName )); + } + + if (!IS_INTRESOURCE(className)) + { + WCHAR bufferW[256]; + + if (!MultiByteToWideChar( CP_ACP, 0, className, -1, bufferW, sizeof(bufferW)/sizeof(WCHAR) )) + return 0; + hwnd = create_window16( (CREATESTRUCTW *)&cs, bufferW, HINSTANCE_32(instance), 0 ); + } + else + { + if (!GlobalGetAtomNameA( LOWORD(className), buffer, sizeof(buffer) )) return 0; + cs.lpszClass = buffer; + hwnd = create_window16( (CREATESTRUCTW *)&cs, (LPCWSTR)className, HINSTANCE_32(instance), 0 ); + } + return HWND_16( hwnd ); +} + + +/*********************************************************************** * GetInternalWindowPos (USER.460) */ UINT16 WINAPI GetInternalWindowPos16( HWND16 hwnd, LPRECT16 rectWnd, LPPOINT16 ptIcon )

1 0

Alexandre Julliard : user32: Support calling a 32-bit procedure even without a corresponding thunk in CallWindowProc16 .
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: cb060d644938ff54805f7de6773314f0a974bc4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb060d644938ff54805f7de67… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 21 15:01:02 2009 +0100 user32: Support calling a 32-bit procedure even without a corresponding thunk in CallWindowProc16. --- dlls/user32/msg16.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index db6de66..5304a9d 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -1536,8 +1536,11 @@ LRESULT WINAPI CallWindowProc16( WNDPROC16 func, HWND16 hwnd, UINT16 msg, if (index == -1 || index >= MAX_WINPROCS32) call_window_proc16( hwnd, msg, wParam, lParam, &result, func ); else - WINPROC_CallProc16To32A( call_window_proc_callback, hwnd, msg, wParam, lParam, &result, - thunk_array[index].proc ); + { + WNDPROC proc = (WNDPROC)func; + if (thunk_array && thunk_array[index].proc) proc = thunk_array[index].proc; + WINPROC_CallProc16To32A( call_window_proc_callback, hwnd, msg, wParam, lParam, &result, proc ); + } return result; }

1 0

Juan Lang : crypt32: Don' t get confused matching URLs with a colon in the userinfo portion (e.g. user:password@domain).
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 4e18ac601f9ea1adebc1c2d36af6d75054e0ca6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e18ac601f9ea1adebc1c2d36… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Dec 18 10:34:25 2009 -0800 crypt32: Don't get confused matching URLs with a colon in the userinfo portion (e.g. user:password(a)domain). --- dlls/crypt32/chain.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 28a2206..b2160f3 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -686,8 +686,12 @@ static BOOL url_matches(LPCWSTR constraint, LPCWSTR name, authority_end = strchrW(name, '?'); if (!authority_end) authority_end = name + strlenW(name); - /* Remove any port number from the authority */ - for (colon = authority_end; colon >= name && *colon != ':'; colon--) + /* Remove any port number from the authority. The userinfo portion + * of an authority may contain a colon, so stop if a userinfo portion + * is found (indicated by '@'). + */ + for (colon = authority_end; colon >= name && *colon != ':' && + *colon != '@'; colon--) ; if (*colon == ':') authority_end = colon;

1 0

Henri Verbeet : wined3d: NULL vertex declarations are captured, but not applied.
by Alexandre Julliard Dec. 21, 2009

Dec. 21, 2009

Module: wine Branch: master Commit: 79a20453958b4e7521970b3eb0f4eac17151d87e URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a20453958b4e7521970b3eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 18 16:21:37 2009 +0100 wined3d: NULL vertex declarations are captured, but not applied. --- dlls/d3d9/tests/stateblock.c | 170 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/stateblock.c | 6 +- 2 files changed, 172 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=79a20453958b4e7521970…

1 0

Alexandre Julliard : Wine release 1.1.35
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: website Branch: master Commit: b31f16b8a080318160cb9c691df4618bd8a8ce1e URL: http://source.winehq.org/git/website.git/?a=commit;h=b31f16b8a080318160cb9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 20:07:23 2009 +0100 Wine release 1.1.35 --- news/en/2009121801.xml | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/news/en/2009121801.xml b/news/en/2009121801.xml new file mode 100644 index 0000000..824676b --- /dev/null +++ b/news/en/2009121801.xml @@ -0,0 +1,18 @@ +<news> +<date>December 18, 2009</date> +<title>Wine 1.1.35 Released</title> +<body> + The Wine development release 1.1.35 is now available. + <a href="{$root}/announce/1.1.35">What's new</a> in this release: +<ul> + <li>Support for OLE transacted storage.</li> + <li>Better certificate checking on secure connections.</li> + <li>More progress on the 16-bit separation.</li> + <li>Left 4 Dead 2 DRM really supported now.</li> + <li>MSI performance improvements.</li> + <li>64-bit fixes in debugger support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="http://prdownloads.sourceforge.net/wine/wine-1.1.35.tar.bz2">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-1.1.35 : Alexandre Julliard : Release 1.1.35
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: refs/tags/wine-1.1.35 Tag: cb7cdd482c3a82fdae4a845a4c2e2590d775ce05 URL: http://source.winehq.org/git/wine.git/?a=tag;h=cb7cdd482c3a82fdae4a845a4c2e… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 19:56:03 2009 +0100 Release 1.1.35

1 0

Alexandre Julliard : Release 1.1.35.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: 59af9ad142120fdda8d37b095936eb765a2e6fda URL: http://source.winehq.org/git/wine.git/?a=commit;h=59af9ad142120fdda8d37b095… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 18 19:56:02 2009 +0100 Release 1.1.35. --- ANNOUNCE | 1735 ++++++++++++++++++++++++++++--------------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 807 insertions(+), 948 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59af9ad142120fdda8d37…

1 0

Jörg Höhle : mciavi: Do not stub unsupported recording or editing functions.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: 4ed7cb86562d99ea5a8a4fe01d07a1eef948f57f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed7cb86562d99ea5a8a4fe01… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Nov 26 16:59:51 2009 +0100 mciavi: Do not stub unsupported recording or editing functions. Native does not announce CAN SAVE / RECORD / LOCK capabilities either. --- dlls/mciavi32/mciavi.c | 323 +++--------------------------------------------- 1 files changed, 19 insertions(+), 304 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ed7cb86562d99ea5a8a4…

1 0

Eric van Beurden : usp10: Change the header includes to pull in 'windows.h' instead of the component headers.
by Alexandre Julliard Dec. 18, 2009

Dec. 18, 2009

Module: wine Branch: master Commit: 2d3caa516e1256dfdd8185795807bba1a1c0bfaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d3caa516e1256dfdd8185795… Author: Eric van Beurden <ericvb(a)transgaming.com> Date: Thu Dec 17 15:30:41 2009 -0500 usp10: Change the header includes to pull in 'windows.h' instead of the component headers. --- dlls/usp10/tests/usp10.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 9a4c3c6..5795e90 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -27,11 +27,7 @@ #include <stdio.h> #include <wine/test.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> -#include <winerror.h> -#include <winnls.h> +#include <windows.h> #include <usp10.h> static void test_ScriptShape(HDC hdc) @@ -1177,7 +1173,7 @@ static void test_digit_substitution(void) LGRPID_ARMENIAN }; HMODULE hKernel32; - static BOOL (WINAPI * pEnumLanguageGroupLocalesA)(LANGGROUPLOCALE_ENUMPROC,LGRPID,DWORD,LONG_PTR); + static BOOL (WINAPI * pEnumLanguageGroupLocalesA)(LANGGROUPLOCALE_ENUMPROCA,LGRPID,DWORD,LONG_PTR); hKernel32 = GetModuleHandleA("kernel32.dll"); pEnumLanguageGroupLocalesA = (void*)GetProcAddress(hKernel32, "EnumLanguageGroupLocalesA");

1 0