wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Alexandre Julliard : user32: Pack the CREATESTRUCTW structure in messages to allow crossing 32/ 64 boundaries.
by Alexandre Julliard 31 Mar '10

31 Mar '10

Module: wine Branch: master Commit: fcf8a819047e4ac2bbc02554e94bb233a4607d9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcf8a819047e4ac2bbc02554e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 20:26:10 2010 +0200 user32: Pack the CREATESTRUCTW structure in messages to allow crossing 32/64 boundaries. --- dlls/user32/message.c | 139 +++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 116 insertions(+), 23 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index f8e4a43..cab4113 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -56,12 +56,41 @@ WINE_DECLARE_DEBUG_CHANNEL(key); #define SYS_TIMER_RATE 55 /* min. timer rate in ms (actually 54.925)*/ +/* the various structures that can be sent in messages, in platform-independent layout */ +struct packed_CREATESTRUCTW +{ + ULONGLONG lpCreateParams; + ULONGLONG hInstance; + user_handle_t hMenu; + DWORD __pad1; + user_handle_t hwndParent; + DWORD __pad2; + INT cy; + INT cx; + INT y; + INT x; + LONG style; + ULONGLONG lpszName; + ULONGLONG lpszClass; + DWORD dwExStyle; + DWORD __pad3; +}; + +/* the structures are unpacked on top of the packed ones, so make sure they fit */ +C_ASSERT( sizeof(struct packed_CREATESTRUCTW) >= sizeof(CREATESTRUCTW) ); + +union packed_structs +{ + struct packed_CREATESTRUCTW cs; +}; + /* description of the data fields that need to be packed along with a sent message */ struct packed_message { - int count; - const void *data[MAX_PACK_COUNT]; - size_t size[MAX_PACK_COUNT]; + union packed_structs ps; + int count; + const void *data[MAX_PACK_COUNT]; + size_t size[MAX_PACK_COUNT]; }; /* info about the message currently being received by the current thread */ @@ -267,6 +296,19 @@ static inline BOOL check_string( LPCWSTR str, size_t size ) return FALSE; } +/* pack a pointer into a 32/64 portable format */ +static inline ULONGLONG pack_ptr( const void *ptr ) +{ + return (ULONG_PTR)ptr; +} + +/* unpack a potentially 64-bit pointer, returning 0 when truncated */ +static inline void *unpack_ptr( ULONGLONG ptr64 ) +{ + if ((ULONG_PTR)ptr64 != ptr64) return 0; + return (void *)(ULONG_PTR)ptr64; +} + /* make sure that there is space for 'size' bytes in buffer, growing it if needed */ static inline void *get_buffer_space( void **buffer, size_t size ) { @@ -544,10 +586,22 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara case WM_CREATE: { CREATESTRUCTW *cs = (CREATESTRUCTW *)lparam; - push_data( data, cs, sizeof(*cs) ); + data->ps.cs.lpCreateParams = pack_ptr( cs->lpCreateParams ); + data->ps.cs.hInstance = pack_ptr( cs->hInstance ); + data->ps.cs.hMenu = wine_server_user_handle( cs->hMenu ); + data->ps.cs.hwndParent = wine_server_user_handle( cs->hwndParent ); + data->ps.cs.cy = cs->cy; + data->ps.cs.cx = cs->cx; + data->ps.cs.y = cs->y; + data->ps.cs.x = cs->x; + data->ps.cs.style = cs->style; + data->ps.cs.dwExStyle = cs->dwExStyle; + data->ps.cs.lpszName = pack_ptr( cs->lpszName ); + data->ps.cs.lpszClass = pack_ptr( cs->lpszClass ); + push_data( data, &data->ps.cs, sizeof(data->ps.cs) ); if (!IS_INTRESOURCE(cs->lpszName)) push_string( data, cs->lpszName ); if (!IS_INTRESOURCE(cs->lpszClass)) push_string( data, cs->lpszClass ); - return sizeof(*cs); + return sizeof(data->ps.cs); } case WM_GETTEXT: case WM_ASKCBFORMATNAME: @@ -774,28 +828,42 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa void **buffer, size_t size ) { size_t minsize = 0; + union packed_structs *ps = *buffer; switch(message) { case WM_NCCREATE: case WM_CREATE: { - CREATESTRUCTW *cs = *buffer; - WCHAR *str = (WCHAR *)(cs + 1); - if (size < sizeof(*cs)) return FALSE; - size -= sizeof(*cs); - if (!IS_INTRESOURCE(cs->lpszName)) + CREATESTRUCTW cs; + WCHAR *str = (WCHAR *)(&ps->cs + 1); + if (size < sizeof(ps->cs)) return FALSE; + size -= sizeof(ps->cs); + cs.lpCreateParams = unpack_ptr( ps->cs.lpCreateParams ); + cs.hInstance = unpack_ptr( ps->cs.hInstance ); + cs.hMenu = wine_server_ptr_handle( ps->cs.hMenu ); + cs.hwndParent = wine_server_ptr_handle( ps->cs.hwndParent ); + cs.cy = ps->cs.cy; + cs.cx = ps->cs.cx; + cs.y = ps->cs.y; + cs.x = ps->cs.x; + cs.style = ps->cs.style; + cs.dwExStyle = ps->cs.dwExStyle; + cs.lpszName = unpack_ptr( ps->cs.lpszName ); + cs.lpszClass = unpack_ptr( ps->cs.lpszClass ); + if (ps->cs.lpszName >> 16) { if (!check_string( str, size )) return FALSE; - cs->lpszName = str; + cs.lpszName = str; size -= (strlenW(str) + 1) * sizeof(WCHAR); str += strlenW(str) + 1; } - if (!IS_INTRESOURCE(cs->lpszClass)) + if (ps->cs.lpszClass >> 16) { if (!check_string( str, size )) return FALSE; - cs->lpszClass = str; + cs.lpszClass = str; } + memcpy( &ps->cs, &cs, sizeof(cs) ); break; } case WM_GETTEXT: @@ -1053,8 +1121,23 @@ static void pack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, { case WM_NCCREATE: case WM_CREATE: - push_data( data, (CREATESTRUCTW *)lparam, sizeof(CREATESTRUCTW) ); + { + CREATESTRUCTW *cs = (CREATESTRUCTW *)lparam; + data->ps.cs.lpCreateParams = (ULONG_PTR)cs->lpCreateParams; + data->ps.cs.hInstance = (ULONG_PTR)cs->hInstance; + data->ps.cs.hMenu = wine_server_user_handle( cs->hMenu ); + data->ps.cs.hwndParent = wine_server_user_handle( cs->hwndParent ); + data->ps.cs.cy = cs->cy; + data->ps.cs.cx = cs->cx; + data->ps.cs.y = cs->y; + data->ps.cs.x = cs->x; + data->ps.cs.style = cs->style; + data->ps.cs.dwExStyle = cs->dwExStyle; + data->ps.cs.lpszName = (ULONG_PTR)cs->lpszName; + data->ps.cs.lpszClass = (ULONG_PTR)cs->lpszClass; + push_data( data, &data->ps.cs, sizeof(data->ps.cs) ); break; + } case WM_GETTEXT: case CB_GETLBTEXT: case LB_GETTEXT: @@ -1132,18 +1215,28 @@ static void pack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, static void unpack_reply( HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam, void *buffer, size_t size ) { + union packed_structs *ps = buffer; + switch(message) { case WM_NCCREATE: case WM_CREATE: - { - CREATESTRUCTW *cs = (CREATESTRUCTW *)lparam; - LPCWSTR name = cs->lpszName, class = cs->lpszClass; - memcpy( cs, buffer, min( sizeof(*cs), size )); - cs->lpszName = name; /* restore the original pointers */ - cs->lpszClass = class; + if (size >= sizeof(ps->cs)) + { + CREATESTRUCTW *cs = (CREATESTRUCTW *)lparam; + cs->lpCreateParams = unpack_ptr( ps->cs.lpCreateParams ); + cs->hInstance = unpack_ptr( ps->cs.hInstance ); + cs->hMenu = wine_server_ptr_handle( ps->cs.hMenu ); + cs->hwndParent = wine_server_ptr_handle( ps->cs.hwndParent ); + cs->cy = ps->cs.cy; + cs->cx = ps->cs.cx; + cs->y = ps->cs.y; + cs->x = ps->cs.x; + cs->style = ps->cs.style; + cs->dwExStyle = ps->cs.dwExStyle; + /* don't allow changing name and class pointers */ + } break; - } case WM_GETTEXT: case WM_ASKCBFORMATNAME: memcpy( (WCHAR *)lparam, buffer, min( wparam*sizeof(WCHAR), size )); @@ -1248,7 +1341,7 @@ static void reply_message( struct received_message_info *info, LRESULT result, B if (info->flags & ISMEX_NOTIFY) return; /* notify messages don't get replies */ if (!remove && replied) return; /* replied already */ - data.count = 0; + memset( &data, 0, sizeof(data) ); info->flags |= ISMEX_REPLIED; if (info->type == MSG_OTHER_PROCESS && !replied) @@ -2315,7 +2408,7 @@ static BOOL put_message_in_queue( const struct send_message_info *info, size_t * timeout = (timeout_t)max( 0, (int)info->timeout ) * -10000; } - data.count = 0; + memset( &data, 0, sizeof(data) ); if (info->type == MSG_OTHER_PROCESS) { *reply_size = pack_message( info->hwnd, info->msg, info->wparam, info->lparam, &data );

1 0

Nikolay Sivov : shell32: Rename My Computer folder implementation structure .
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: c38d56547d03d20bfc9c87c9cd58e865fe892551 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c38d56547d03d20bfc9c87c9c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 30 18:32:01 2010 +0400 shell32: Rename My Computer folder implementation structure. --- dlls/shell32/shfldr_mycomp.c | 87 +++++++++++++++++++---------------------- 1 files changed, 40 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c38d56547d03d20bfc9c8…

1 0

Nikolay Sivov : shell32: Rename desktop folder data structure to reflect its meaning.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 7fbc5504665f001d4b7f09c4e46b5181a31bf2ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbc5504665f001d4b7f09c4e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 30 01:30:37 2010 +0400 shell32: Rename desktop folder data structure to reflect its meaning. --- dlls/shell32/shfldr_desktop.c | 107 ++++++++++++++++++++--------------------- 1 files changed, 52 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fbc5504665f001d4b7f0…

1 0

Nikolay Sivov : shlwapi: Some SHCreateWorkerWindowA tests.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 803dea332623947cc8f829d32ae9cd1807e375b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=803dea332623947cc8f829d32… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 30 00:24:35 2010 +0400 shlwapi: Some SHCreateWorkerWindowA tests. --- dlls/shlwapi/ordinal.c | 36 ++++++++++------------ dlls/shlwapi/tests/ordinal.c | 68 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 80 insertions(+), 24 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 8209217..a72dba3 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -2595,21 +2595,21 @@ HRESULT WINAPI IUnknown_GetSite(LPUNKNOWN lpUnknown, REFIID iid, PVOID *lppSite) * dwExStyle [I] Extra style flags * dwStyle [I] Style flags * hMenu [I] Window menu - * z [I] Unknown + * msg_result [I] New DWLP_MSGRESULT value * * RETURNS * Success: The window handle of the newly created window. * Failure: 0. */ HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle, - DWORD dwStyle, HMENU hMenu, LONG z) + DWORD dwStyle, HMENU hMenu, LONG msg_result) { static const char szClass[] = "WorkerA"; WNDCLASSA wc; HWND hWnd; - TRACE("(0x%08x,%p,0x%08x,0x%08x,%p,0x%08x)\n", - wndProc, hWndParent, dwExStyle, dwStyle, hMenu, z); + TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x)\n", + wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); /* Create Window class */ wc.style = 0; @@ -2623,19 +2623,17 @@ HWND WINAPI SHCreateWorkerWindowA(LONG wndProc, HWND hWndParent, DWORD dwExStyle wc.lpszMenuName = NULL; wc.lpszClassName = szClass; - SHRegisterClassA(&wc); /* Register class */ - - /* FIXME: Set extra bits in dwExStyle */ + SHRegisterClassA(&wc); hWnd = CreateWindowExA(dwExStyle, szClass, 0, dwStyle, 0, 0, 0, 0, hWndParent, hMenu, shlwapi_hInstance, 0); if (hWnd) { - SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, z); + SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, msg_result); - if (wndProc) - SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc); + if (wndProc) SetWindowLongPtrA(hWnd, GWLP_WNDPROC, wndProc); } + return hWnd; } @@ -2893,20 +2891,20 @@ DWORD WINAPI WhichPlatform(void) * Unicode version of SHCreateWorkerWindowA. */ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle, - DWORD dwStyle, HMENU hMenu, LONG z) + DWORD dwStyle, HMENU hMenu, LONG msg_result) { static const WCHAR szClass[] = { 'W', 'o', 'r', 'k', 'e', 'r', 'W', 0 }; WNDCLASSW wc; HWND hWnd; - TRACE("(0x%08x,%p,0x%08x,0x%08x,%p,0x%08x)\n", - wndProc, hWndParent, dwExStyle, dwStyle, hMenu, z); + TRACE("(0x%08x, %p, 0x%08x, 0x%08x, %p, 0x%08x)\n", + wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); /* If our OS is natively ANSI, use the ANSI version */ if (GetVersion() & 0x80000000) /* not NT */ { TRACE("fallback to ANSI, ver 0x%08x\n", GetVersion()); - return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, dwStyle, hMenu, z); + return SHCreateWorkerWindowA(wndProc, hWndParent, dwExStyle, dwStyle, hMenu, msg_result); } /* Create Window class */ @@ -2921,19 +2919,17 @@ HWND WINAPI SHCreateWorkerWindowW(LONG wndProc, HWND hWndParent, DWORD dwExStyle wc.lpszMenuName = NULL; wc.lpszClassName = szClass; - SHRegisterClassW(&wc); /* Register class */ - - /* FIXME: Set extra bits in dwExStyle */ + SHRegisterClassW(&wc); hWnd = CreateWindowExW(dwExStyle, szClass, 0, dwStyle, 0, 0, 0, 0, hWndParent, hMenu, shlwapi_hInstance, 0); if (hWnd) { - SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, z); + SetWindowLongPtrW(hWnd, DWLP_MSGRESULT, msg_result); - if (wndProc) - SetWindowLongPtrW(hWnd, GWLP_WNDPROC, wndProc); + if (wndProc) SetWindowLongPtrW(hWnd, GWLP_WNDPROC, wndProc); } + return hWnd; } diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 6f518e9..1c25f12 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -34,6 +34,8 @@ /* Function ptrs for ordinal calls */ static HMODULE hShlwapi; +static BOOL is_win2k_and_lower; + static int (WINAPI *pSHSearchMapInt)(const int*,const int*,int,int); static HRESULT (WINAPI *pGetAcceptLanguagesA)(LPSTR,LPDWORD); @@ -53,6 +55,7 @@ static DWORD (WINAPI *pSHGetObjectCompatFlags)(IUnknown*, const CLSID*); static BOOL (WINAPI *pGUIDFromStringA)(LPSTR, CLSID *); static HRESULT (WINAPI *pIUnknown_QueryServiceExec)(IUnknown*, REFIID, const GUID*, DWORD, DWORD, VARIANT*, VARIANT*); static HRESULT (WINAPI *pIUnknown_ProfferService)(IUnknown*, REFGUID, IServiceProvider*, DWORD*); +static HWND (WINAPI *pSHCreateWorkerWindowA)(LONG, HWND, DWORD, DWORD, HMENU, LONG); static HMODULE hmlang; static HRESULT (WINAPI *pLcidToRfc1766A)(LCID, LPSTR, INT); @@ -2139,7 +2142,6 @@ static const IServiceProviderVtbl IServiceProviderImpl_Vtbl = static void test_IUnknown_QueryServiceExec(void) { IServiceProvider *provider = IServiceProviderImpl_Construct(); - void *test_ptr = (void*)GetProcAddress(hShlwapi, "StrChrNW"); static const GUID dummy_serviceid = { 0xdeadbeef }; static const GUID dummy_groupid = { 0xbeefbeef }; call_trace_t trace_expected; @@ -2147,7 +2149,7 @@ static void test_IUnknown_QueryServiceExec(void) /* on <=W2K platforms same ordinal used for another export with different prototype, so skipping using this indirect condition */ - if (!test_ptr) + if (is_win2k_and_lower) { win_skip("IUnknown_QueryServiceExec is not available\n"); return; @@ -2250,7 +2252,6 @@ static const IProfferServiceVtbl IProfferServiceImpl_Vtbl = static void test_IUnknown_ProfferService(void) { - void *test_ptr = (void*)GetProcAddress(hShlwapi, "StrChrNW"); IServiceProvider *provider = IServiceProviderImpl_Construct(); IProfferService *proff = IProfferServiceImpl_Construct(); static const GUID dummy_serviceid = { 0xdeadbeef }; @@ -2260,7 +2261,7 @@ static void test_IUnknown_ProfferService(void) /* on <=W2K platforms same ordinal used for another export with different prototype, so skipping using this indirect condition */ - if (!test_ptr) + if (is_win2k_and_lower) { win_skip("IUnknown_ProfferService is not available\n"); return; @@ -2312,6 +2313,62 @@ static void test_IUnknown_ProfferService(void) IProfferService_Release(proff); } +static void test_SHCreateWorkerWindowA(void) +{ + WNDCLASSA cliA; + char classA[20]; + HWND hwnd; + LONG ret; + BOOL res; + + if (is_win2k_and_lower) + { + win_skip("SHCreateWorkerWindowA not available\n"); + return; + } + + hwnd = pSHCreateWorkerWindowA(0, NULL, 0, 0, 0, 0); + ok(hwnd != 0, "expected window\n"); + + GetClassName(hwnd, classA, 20); + ok(lstrcmpA(classA, "WorkerA") == 0, "expected WorkerA class, got %s\n", classA); + + ret = GetWindowLongA(hwnd, DWLP_MSGRESULT); + ok(ret == 0, "got %d\n", ret); + + /* class info */ + memset(&cliA, 0, sizeof(cliA)); + res = GetClassInfoA(GetModuleHandle("shlwapi.dll"), "WorkerA", &cliA); + ok(res, "failed to get class info\n"); + ok(cliA.style == 0, "got 0x%08x\n", cliA.style); + ok(cliA.cbClsExtra == 0, "got %d\n", cliA.cbClsExtra); + ok(cliA.cbWndExtra == 4, "got %d\n", cliA.cbWndExtra); + ok(cliA.lpszMenuName == 0, "got %s\n", cliA.lpszMenuName); + + DestroyWindow(hwnd); + + /* set DWLP_MSGRESULT */ + hwnd = pSHCreateWorkerWindowA(0, NULL, 0, 0, 0, 0xdeadbeef); + ok(hwnd != 0, "expected window\n"); + + GetClassName(hwnd, classA, 20); + ok(lstrcmpA(classA, "WorkerA") == 0, "expected WorkerA class, got %s\n", classA); + + ret = GetWindowLongA(hwnd, DWLP_MSGRESULT); + ok(ret == 0xdeadbeef, "got %d\n", ret); + + /* test exstyle */ + ret = GetWindowLongA(hwnd, GWL_EXSTYLE); + ok(ret == WS_EX_WINDOWEDGE, "0x%08x\n", ret); + + DestroyWindow(hwnd); + + hwnd = pSHCreateWorkerWindowA(0, NULL, WS_EX_TOOLWINDOW, 0, 0, 0); + ret = GetWindowLongA(hwnd, GWL_EXSTYLE); + ok(ret == (WS_EX_WINDOWEDGE|WS_EX_TOOLWINDOW), "0x%08x\n", ret); + DestroyWindow(hwnd); +} + static void init_pointers(void) { #define MAKEFUNC(f, ord) (p##f = (void*)GetProcAddress(hShlwapi, (LPSTR)(ord))) @@ -2323,6 +2380,7 @@ static void init_pointers(void) MAKEFUNC(SHSetWindowBits, 165); MAKEFUNC(ConnectToConnectionPoint, 168); MAKEFUNC(SHSearchMapInt, 198); + MAKEFUNC(SHCreateWorkerWindowA, 257); MAKEFUNC(GUIDFromStringA, 269); MAKEFUNC(SHPackDispParams, 282); MAKEFUNC(IConnectionPoint_InvokeWithCancel, 283); @@ -2339,6 +2397,7 @@ static void init_pointers(void) START_TEST(ordinal) { hShlwapi = GetModuleHandleA("shlwapi.dll"); + is_win2k_and_lower = GetProcAddress(hShlwapi, "StrChrNW") == 0; init_pointers(); @@ -2359,4 +2418,5 @@ START_TEST(ordinal) test_SHGetObjectCompatFlags(); test_IUnknown_QueryServiceExec(); test_IUnknown_ProfferService(); + test_SHCreateWorkerWindowA(); }

1 0

Alexandre Julliard : kernel32: Increase the wineboot timeout.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 02aef1c3b85c7c6cabb129ad4ce2cd663eac6bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=02aef1c3b85c7c6cabb129ad4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 16:50:06 2010 +0200 kernel32: Increase the wineboot timeout. --- dlls/kernel32/process.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 541c794..251da4e 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -1104,10 +1104,10 @@ void CDECL __wine_kernel_init(void) if (boot_events[0]) { - DWORD timeout = 30000, count = 1; + DWORD timeout = 2 * 60 * 1000, count = 1; if (boot_events[1]) count++; - if (!got_environment) timeout = 300000; /* initial prefix creation can take longer */ + if (!got_environment) timeout = 5 * 60 * 1000; /* initial prefix creation can take longer */ if (WaitForMultipleObjects( count, boot_events, FALSE, timeout ) == WAIT_TIMEOUT) ERR( "boot event wait timed out\n" ); CloseHandle( boot_events[0] );

1 0

Alexandre Julliard : wineboot: Display a wait dialog while processing wine. inf.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 9254476d131bbf4b8982962f83fc37e4b36abab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9254476d131bbf4b8982962f8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 16:49:53 2010 +0200 wineboot: Display a wait dialog while processing wine.inf. --- programs/wineboot/resource.h | 4 ++ programs/wineboot/wineboot.c | 60 +++++++++++++++++++++++++++++++++---- programs/wineboot/wineboot_En.rc | 10 ++++++ 3 files changed, 67 insertions(+), 7 deletions(-) diff --git a/programs/wineboot/resource.h b/programs/wineboot/resource.h index a59454a..4ff3c69 100644 --- a/programs/wineboot/resource.h +++ b/programs/wineboot/resource.h @@ -20,4 +20,8 @@ #include "winuser.h" #define IDC_STATIC -1 +#define IDC_WAITICON 1 +#define IDC_WAITTEXT 2 + #define IDD_ENDTASK 100 +#define IDD_WAITDLG 101 diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index ac403b9..32ac3ac 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -81,6 +81,7 @@ #include <shobjidl.h> #include <shlwapi.h> #include <shellapi.h> +#include "resource.h" WINE_DEFAULT_DEBUG_CHANNEL(wineboot); @@ -859,6 +860,44 @@ static BOOL start_services_process(void) return TRUE; } +static INT_PTR CALLBACK wait_dlgproc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +{ + switch (msg) + { + case WM_INITDIALOG: + { + WCHAR *buffer, text[1024]; + const WCHAR *name = (WCHAR *)lp; + HICON icon = LoadImageW( 0, (LPCWSTR)IDI_WINLOGO, IMAGE_ICON, 48, 48, LR_SHARED ); + SendDlgItemMessageW( hwnd, IDC_WAITICON, STM_SETICON, (WPARAM)icon, 0 ); + SendDlgItemMessageW( hwnd, IDC_WAITTEXT, WM_GETTEXT, 1024, (LPARAM)text ); + buffer = HeapAlloc( GetProcessHeap(), 0, (strlenW(text) + strlenW(name) + 1) * sizeof(WCHAR) ); + sprintfW( buffer, text, name ); + SendDlgItemMessageW( hwnd, IDC_WAITTEXT, WM_SETTEXT, 0, (LPARAM)buffer ); + HeapFree( GetProcessHeap(), 0, buffer ); + } + break; + } + return 0; +} + +static HWND show_wait_window(void) +{ + const char *config_dir = wine_get_config_dir(); + WCHAR *name; + HWND hwnd; + DWORD len; + + len = MultiByteToWideChar( CP_UNIXCP, 0, config_dir, -1, NULL, 0 ); + name = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); + MultiByteToWideChar( CP_UNIXCP, 0, config_dir, -1, name, len ); + hwnd = CreateDialogParamW( GetModuleHandleW(0), MAKEINTRESOURCEW(IDD_WAITDLG), 0, + wait_dlgproc, (LPARAM)name ); + ShowWindow( hwnd, SW_SHOWNORMAL ); + HeapFree( GetProcessHeap(), 0, name ); + return hwnd; +} + static HANDLE start_rundll32( const char *inf_path, BOOL wow64 ) { static const WCHAR rundll[] = {'\\','r','u','n','d','l','l','3','2','.','e','x','e',0}; @@ -930,16 +969,23 @@ static void update_wineprefix( int force ) if (update_timestamp( config_dir, st.st_mtime ) || force) { HANDLE process; + DWORD count = 0; if ((process = start_rundll32( inf_path, FALSE ))) { - WaitForSingleObject( process, INFINITE ); - CloseHandle( process ); - } - if ((process = start_rundll32( inf_path, TRUE ))) - { - WaitForSingleObject( process, INFINITE ); - CloseHandle( process ); + HWND hwnd = show_wait_window(); + for (;;) + { + MSG msg; + DWORD res = MsgWaitForMultipleObjects( 1, &process, FALSE, INFINITE, QS_ALLINPUT ); + if (res == WAIT_OBJECT_0) + { + CloseHandle( process ); + if (count++ || !(process = start_rundll32( inf_path, TRUE ))) break; + } + else while (PeekMessageW( &msg, 0, 0, 0, PM_REMOVE )) DispatchMessageW( &msg ); + } + DestroyWindow( hwnd ); } WINE_MESSAGE( "wine: configuration in '%s' has been updated.\n", config_dir ); } diff --git a/programs/wineboot/wineboot_En.rc b/programs/wineboot/wineboot_En.rc index 4070b72..2b6720b 100644 --- a/programs/wineboot/wineboot_En.rc +++ b/programs/wineboot/wineboot_En.rc @@ -35,3 +35,13 @@ BEGIN LTEXT "If you terminate the process you may lose all unsaved data.", IDC_STATIC,7,28,172,15 END + +IDD_WAITDLG DIALOG 0, 0, 200, 50 +STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_DISABLED +CAPTION "Wine" +FONT 8, "MS Shell Dlg" +BEGIN + ICON "", IDC_WAITICON, 3, 3, 10, 10 + LTEXT "The Wine configuration in %s is being updated, please wait...", + IDC_WAITTEXT, 40, 5, 150, 40, SS_NOPREFIX +END

1 0

Alexandre Julliard : wine.inf: Add a Wow64Install section for the Wow64-specific configuration.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 3edc09fa6dc125324d81a1254163e989a48c46d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3edc09fa6dc125324d81a1254… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 16:44:30 2010 +0200 wine.inf: Add a Wow64Install section for the Wow64-specific configuration. --- tools/wine.inf.in | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 06f0707..8f53088 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -104,6 +104,19 @@ AddReg=\ VersionInfo,\ Wow64 +[Wow64Install] +RegisterDlls=RegisterDllsSection +WineFakeDlls=FakeDllsWin32,FakeDllsWow64 +AddReg=\ + CurrentVersion,\ + Debugger,\ + DirectX,\ + Dotnet,\ + MCI,\ + Misc,\ + Tapi,\ + VersionInfo + [DefaultInstall.Services] AddService=MountMgr,0x800,MountMgrService AddService=Spooler,0,SpoolerService @@ -428,7 +441,6 @@ HKLM,%CurrentVersion%\Explorer\KindMap,,16 HKLM,%CurrentVersion%\Group Policy,,16 HKLM,%CurrentVersion%\Policies,,16 HKLM,%CurrentVersion%\PreviewHandlers,,16 -HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,%CurrentVersion%\Setup,"BootDir",,"%30%" HKLM,%CurrentVersion%\Setup,"SharedDir",,"%25%" HKLM,%CurrentVersion%\Shell Extensions\Approved,,16 @@ -2533,6 +2545,16 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,dosx.exe 11,,dsound.vxd +; Wow64-only fake dlls +[FakeDllsWow64] +; create some directories first +11,mui, +11,wbem, +11,,iexplore.exe,- +11,,winetest.exe,- +12,,mountmgr.sys,- +11,,* + [FakeDlls] ; create some directories first 10,help, @@ -2957,6 +2979,7 @@ StartType=3 ErrorControl=1 [Services] +HKLM,%CurrentVersion%\RunServices,"winemenubuilder",2,"%11%\winemenubuilder.exe -a -r" HKLM,"System\CurrentControlSet\Services\VxD\MSTCP",,16 [VersionInfo] @@ -3026,5 +3049,6 @@ HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Ports,"SymbolicLin HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Print,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\Print" HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\ProfileList,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\ProfileList" HKLM,Software\Wow6432Node\Microsoft\Windows NT\CurrentVersion\Time Zones,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\Time Zones" +HKLM,Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Time Zones,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Windows NT\CurrentVersion\Time Zones" HKLM,Software\Wow6432Node\Policies,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Policies" HKLM,Software\Wow6432Node\Registered Applications,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Registered Applications"

1 0

Alexandre Julliard : wineboot: Start an additional 32-bit instance of rundll32 on 64-bit platforms to do the Wow64-specific setup .
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 39e5f448836a4585d0e47a7329801c442bfff56e URL: http://source.winehq.org/git/wine.git/?a=commit;h=39e5f448836a4585d0e47a732… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 16:43:52 2010 +0200 wineboot: Start an additional 32-bit instance of rundll32 on 64-bit platforms to do the Wow64-specific setup. --- programs/wineboot/wineboot.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 0277206..ac403b9 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -859,12 +859,13 @@ static BOOL start_services_process(void) return TRUE; } -static HANDLE start_rundll32( const char *inf_path ) +static HANDLE start_rundll32( const char *inf_path, BOOL wow64 ) { static const WCHAR rundll[] = {'\\','r','u','n','d','l','l','3','2','.','e','x','e',0}; static const WCHAR setupapi[] = {' ','s','e','t','u','p','a','p','i',',', 'I','n','s','t','a','l','l','H','i','n','f','S','e','c','t','i','o','n',0}; static const WCHAR definstall[] = {' ','D','e','f','a','u','l','t','I','n','s','t','a','l','l',0}; + static const WCHAR wowinstall[] = {' ','W','o','w','6','4','I','n','s','t','a','l','l',0}; static const WCHAR inf[] = {' ','1','2','8',' ','\\','\\','?','\\','u','n','i','x',0 }; WCHAR app[MAX_PATH + sizeof(rundll)/sizeof(WCHAR)]; @@ -876,7 +877,12 @@ static HANDLE start_rundll32( const char *inf_path ) memset( &si, 0, sizeof(si) ); si.cb = sizeof(si); - GetSystemDirectoryW( app, MAX_PATH ); + if (wow64) + { + if (!GetSystemWow64DirectoryW( app, MAX_PATH )) return 0; /* not on 64-bit */ + } + else GetSystemDirectoryW( app, MAX_PATH ); + strcatW( app, rundll ); cmd_len = strlenW(app) * sizeof(WCHAR) + sizeof(setupapi) + sizeof(definstall) + sizeof(inf); @@ -886,7 +892,7 @@ static HANDLE start_rundll32( const char *inf_path ) strcpyW( buffer, app ); strcatW( buffer, setupapi ); - strcatW( buffer, definstall ); + strcatW( buffer, wow64 ? wowinstall : definstall ); strcatW( buffer, inf ); MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, buffer + strlenW(buffer), inf_len ); @@ -925,7 +931,12 @@ static void update_wineprefix( int force ) { HANDLE process; - if ((process = start_rundll32( inf_path ))) + if ((process = start_rundll32( inf_path, FALSE ))) + { + WaitForSingleObject( process, INFINITE ); + CloseHandle( process ); + } + if ((process = start_rundll32( inf_path, TRUE ))) { WaitForSingleObject( process, INFINITE ); CloseHandle( process );

1 0

Alexandre Julliard : wineboot: Use rundll32 to apply wine. inf instead of calling setupapi directly.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 2d08d3e08479c8f8d6d04ad42e78f5ed10c48b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d08d3e08479c8f8d6d04ad42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 30 16:38:58 2010 +0200 wineboot: Use rundll32 to apply wine.inf instead of calling setupapi directly. --- programs/wineboot/Makefile.in | 2 +- programs/wineboot/wineboot.c | 57 +++++++++++++++++++++++++++++++++-------- 2 files changed, 47 insertions(+), 12 deletions(-) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in index 0b8ec86..0b91263 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = wineboot.exe APPMODE = -mconsole IMPORTS = uuid advapi32 kernel32 ntdll -DELAYIMPORTS = setupapi shell32 shlwapi version user32 +DELAYIMPORTS = shell32 shlwapi version user32 C_SRCS = \ shutdown.c \ diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 15dfe14..0277206 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -81,7 +81,6 @@ #include <shobjidl.h> #include <shlwapi.h> #include <shellapi.h> -#include <setupapi.h> WINE_DEFAULT_DEBUG_CHANNEL(wineboot); @@ -860,12 +859,49 @@ static BOOL start_services_process(void) return TRUE; } +static HANDLE start_rundll32( const char *inf_path ) +{ + static const WCHAR rundll[] = {'\\','r','u','n','d','l','l','3','2','.','e','x','e',0}; + static const WCHAR setupapi[] = {' ','s','e','t','u','p','a','p','i',',', + 'I','n','s','t','a','l','l','H','i','n','f','S','e','c','t','i','o','n',0}; + static const WCHAR definstall[] = {' ','D','e','f','a','u','l','t','I','n','s','t','a','l','l',0}; + static const WCHAR inf[] = {' ','1','2','8',' ','\\','\\','?','\\','u','n','i','x',0 }; + + WCHAR app[MAX_PATH + sizeof(rundll)/sizeof(WCHAR)]; + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR *buffer; + DWORD inf_len, cmd_len; + + memset( &si, 0, sizeof(si) ); + si.cb = sizeof(si); + + GetSystemDirectoryW( app, MAX_PATH ); + strcatW( app, rundll ); + + cmd_len = strlenW(app) * sizeof(WCHAR) + sizeof(setupapi) + sizeof(definstall) + sizeof(inf); + inf_len = MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, NULL, 0 ); + + if (!(buffer = HeapAlloc( GetProcessHeap(), 0, cmd_len + inf_len * sizeof(WCHAR) ))) return 0; + + strcpyW( buffer, app ); + strcatW( buffer, setupapi ); + strcatW( buffer, definstall ); + strcatW( buffer, inf ); + MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, buffer + strlenW(buffer), inf_len ); + + if (CreateProcessW( app, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi )) + CloseHandle( pi.hThread ); + else + pi.hProcess = 0; + + HeapFree( GetProcessHeap(), 0, buffer ); + return pi.hProcess; +} + /* execute rundll32 on the wine.inf file if necessary */ static void update_wineprefix( int force ) { - static const WCHAR cmdlineW[] = {'D','e','f','a','u','l','t','I','n','s','t','a','l','l',' ', - '1','2','8',' ','\\','\\','?','\\','u','n','i','x' }; - const char *config_dir = wine_get_config_dir(); char *inf_path = get_wine_inf_path(); int fd; @@ -887,14 +923,13 @@ static void update_wineprefix( int force ) if (update_timestamp( config_dir, st.st_mtime ) || force) { - WCHAR *buffer; - DWORD len = MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, NULL, 0 ); - if (!(buffer = HeapAlloc( GetProcessHeap(), 0, sizeof(cmdlineW) + len*sizeof(WCHAR) ))) goto done; - memcpy( buffer, cmdlineW, sizeof(cmdlineW) ); - MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, buffer + sizeof(cmdlineW)/sizeof(WCHAR), len ); - - InstallHinfSectionW( 0, 0, buffer, 0 ); - HeapFree( GetProcessHeap(), 0, buffer ); + HANDLE process; + + if ((process = start_rundll32( inf_path ))) + { + WaitForSingleObject( process, INFINITE ); + CloseHandle( process ); + } WINE_MESSAGE( "wine: configuration in '%s' has been updated.\n", config_dir ); }

1 0

Matteo Bruni : d3dx9: Implement a basic bytecode writer.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 18c6f23a9401421d7c7413ff6eb4fc78255e0575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c6f23a9401421d7c7413ff6… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Mon Mar 29 17:57:30 2010 +0200 d3dx9: Implement a basic bytecode writer. Now the shader assembler is structurally complete and it correctly assembles one trivial shader program. --- dlls/d3dx9_36/asmutils.c | 62 +++++++ dlls/d3dx9_36/bytecodewriter.c | 375 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/d3dx9_36_private.h | 9 + dlls/d3dx9_36/shader.c | 23 ++- dlls/d3dx9_36/tests/asm.c | 54 +++--- 5 files changed, 496 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18c6f23a9401421d7c741…

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2010