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

Alexandre Julliard : user32/tests: Add more systematic support for ignoring certain messages.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: d6c8a003e106921e0a2f1de918b0a71eed3e9dc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6c8a003e106921e0a2f1de91… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 12 12:09:30 2009 +0200 user32/tests: Add more systematic support for ignoring certain messages. --- dlls/user32/tests/msg.c | 77 +++++++++++++++++++--------------------------- dlls/user32/tests/win.c | 12 +++++++- 2 files changed, 43 insertions(+), 46 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 782ab8a..6f6b5bd 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1557,6 +1557,8 @@ static const struct message WmEnableWindowSeq_1[] = { { WM_CANCELMODE, sent|wparam|lparam, 0, 0 }, { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, 0, 0 }, + { HCBT_SETFOCUS, hook|optional }, + { WM_KILLFOCUS, sent|optional }, { WM_ENABLE, sent|wparam|lparam, FALSE, 0 }, { 0 } }; @@ -1759,6 +1761,16 @@ static const char *get_winpos_flags(UINT flags) #undef DUMP } +static BOOL ignore_message( UINT message ) +{ + /* these are always ignored */ + return (message >= 0xc000 || + message == WM_GETICON || + message == WM_GETOBJECT || + message == WM_TIMECHANGE || + message == WM_DEVICECHANGE); +} + #define add_message(msg) add_message_(__LINE__,msg); static void add_message_(int line, const struct recvd_message *msg) @@ -1863,6 +1875,8 @@ static void add_message_(int line, const struct recvd_message *msg) sprintf( seq->output, "%s: %p %04x wp %08lx lp %08lx", msg->descr, msg->hwnd, msg->message, msg->wParam, msg->lParam ); } + if (msg->flags & (sent|posted|parent|defwinproc|beginpaint)) + sprintf( seq->output + strlen(seq->output), " (flags %x)", msg->flags ); } } @@ -3202,9 +3216,7 @@ static LRESULT WINAPI mdi_client_hook_proc(HWND hwnd, UINT message, WPARAM wPara message != WM_NCHITTEST && message != WM_GETTEXT && message != WM_MDIGETACTIVE && - message != WM_GETICON && - message != WM_GETOBJECT && - message != WM_DEVICECHANGE) + !ignore_message( message )) { msg.hwnd = hwnd; msg.message = message; @@ -3231,9 +3243,7 @@ static LRESULT WINAPI mdi_child_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, message != WM_ERASEBKGND && message != WM_NCHITTEST && message != WM_GETTEXT && - message != WM_GETICON && - message != WM_GETOBJECT && - message != WM_DEVICECHANGE) + !ignore_message( message )) { switch (message) { @@ -3281,9 +3291,7 @@ static LRESULT WINAPI mdi_frame_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, message != WM_ERASEBKGND && message != WM_NCHITTEST && message != WM_GETTEXT && - message != WM_GETICON && - message != WM_GETOBJECT && - message != WM_DEVICECHANGE) + !ignore_message( message )) { msg.hwnd = hwnd; msg.message = message; @@ -3898,16 +3906,15 @@ static INT_PTR CALLBACK TestModalDlgProcA(HWND hwnd, UINT message, WPARAM wParam { struct recvd_message msg; + if (ignore_message( message )) return 0; + switch (message) { /* ignore */ - case WM_GETICON: - case WM_GETOBJECT: case WM_MOUSEMOVE: case WM_NCMOUSEMOVE: case WM_NCMOUSELEAVE: case WM_SETCURSOR: - case WM_DEVICECHANGE: return 0; case WM_NCHITTEST: return HTCLIENT; @@ -5157,11 +5164,10 @@ static LRESULT CALLBACK button_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LRESULT ret; struct recvd_message msg; + if (ignore_message( message )) return 0; + switch (message) { - case WM_GETICON: - case WM_GETOBJECT: - return 0; /* ignore them */ case WM_SYNCPAINT: break; case BM_SETSTATE: @@ -5318,7 +5324,7 @@ static LRESULT CALLBACK static_hook_proc(HWND hwnd, UINT message, WPARAM wParam, LRESULT ret; struct recvd_message msg; - if (message == WM_GETICON || message == WM_GETOBJECT) return 0; /* ignore them */ + if (ignore_message( message )) return 0; msg.hwnd = hwnd; msg.message = message; @@ -5420,9 +5426,7 @@ static LRESULT CALLBACK combobox_hook_proc(HWND hwnd, UINT message, WPARAM wPara message != WM_ERASEBKGND && message != WM_NCHITTEST && message != WM_GETTEXT && - message != WM_GETICON && - message != WM_GETOBJECT && - message != WM_DEVICECHANGE) + !ignore_message( message )) { msg.hwnd = hwnd; msg.message = message; @@ -6657,10 +6661,8 @@ static void pump_msg_loop(HWND hwnd, HACCEL hAccel) /* ignore some unwanted messages */ if (msg.message == WM_MOUSEMOVE || - msg.message == WM_GETICON || - msg.message == WM_GETOBJECT || msg.message == WM_TIMER || - msg.message == WM_DEVICECHANGE) + ignore_message( msg.message )) continue; log_msg.hwnd = msg.hwnd; @@ -6902,8 +6904,7 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, LRESULT ret; struct recvd_message msg; - /* ignore registered messages */ - if (message >= 0xc000) return 0; + if (ignore_message( message )) return 0; switch (message) { @@ -6966,9 +6967,6 @@ static LRESULT MsgCheckProc (BOOL unicode, HWND hwnd, UINT message, case WM_MOUSEACTIVATE: case WM_NCMOUSEMOVE: case WM_SETCURSOR: - case WM_GETICON: - case WM_GETOBJECT: - case WM_DEVICECHANGE: case WM_IME_SELECT: return 0; } @@ -7038,11 +7036,10 @@ static LRESULT WINAPI PopupMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LRESULT ret; struct recvd_message msg; + if (ignore_message( message )) return 0; + switch (message) { - case WM_GETICON: - case WM_GETOBJECT: - return 0; /* ignore them */ case WM_QUERYENDSESSION: case WM_ENDSESSION: lParam &= ~0x01; /* Vista adds a 0x01 flag */ @@ -7078,10 +7075,7 @@ static LRESULT WINAPI ParentMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam LRESULT ret; struct recvd_message msg; - if (message == WM_GETICON || message == WM_GETOBJECT) return 0; /* ignore them */ - - /* ignore registered messages */ - if (message >= 0xc000) return 0; + if (ignore_message( message )) return 0; if (log_all_parent_messages || message == WM_PARENTNOTIFY || message == WM_CANCELMODE || @@ -7145,7 +7139,7 @@ static LRESULT WINAPI TestDlgProcA(HWND hwnd, UINT message, WPARAM wParam, LPARA LRESULT ret; struct recvd_message msg; - if (message == WM_GETICON || message == WM_GETOBJECT) return 0; /* ignore them */ + if (ignore_message( message )) return 0; if (test_def_id) { @@ -8773,7 +8767,7 @@ static LRESULT CALLBACK edit_hook_proc(HWND hwnd, UINT message, WPARAM wParam, L LRESULT ret; struct recvd_message msg; - if (message == WM_GETICON || message == WM_GETOBJECT) return 0; /* ignore them */ + if (ignore_message( message )) return 0; msg.hwnd = hwnd; msg.message = message; @@ -10271,12 +10265,7 @@ static INT_PTR WINAPI test_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPAR { struct recvd_message msg; - switch (message) - { - case WM_GETICON: - case WM_GETOBJECT: - return 0; /* ignore them */ - } + if (ignore_message( message )) return 0; msg.hwnd = hwnd; msg.message = message; @@ -11052,9 +11041,7 @@ static LRESULT WINAPI listbox_hook_proc(HWND hwnd, UINT message, WPARAM wp, LPAR message != WM_ERASEBKGND && message != WM_NCHITTEST && message != WM_GETTEXT && - message != WM_GETOBJECT && - message != WM_GETICON && - message != WM_DEVICECHANGE) + !ignore_message( message )) { msg.hwnd = hwnd; msg.message = message; diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 1f0420e..13e5d67 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -118,6 +118,16 @@ static void check_parents( HWND hwnd, HWND ga_parent, HWND gwl_parent, HWND get_ } } +static BOOL ignore_message( UINT message ) +{ + /* these are always ignored */ + return (message >= 0xc000 || + message == WM_GETICON || + message == WM_GETOBJECT || + message == WM_TIMECHANGE || + message == WM_DEVICECHANGE); +} + static BOOL CALLBACK EnumChildProc( HWND hwndChild, LPARAM lParam) { (*(LPINT)lParam)++; @@ -2713,7 +2723,7 @@ static BOOL wait_for_message( MSG *msg ) if (ret) { if (msg->message == WM_PAINT) DispatchMessage(msg); - else if (msg->message < 0xc000) break; /* skip registered messages */ + else if (!ignore_message(msg->message)) break; } else if (MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ) == WAIT_TIMEOUT) break; }

1 0

Rico Schüller : wined3d: Add UnregisterClass() on DLL_PROCESS_DETACH.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 2ef751883d08a59aa050bd0742f91aedb7cad69f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ef751883d08a59aa050bd074… Author: Rico Schüller <kgbricola(a)web.de> Date: Mon May 11 21:43:54 2009 +0200 wined3d: Add UnregisterClass() on DLL_PROCESS_DETACH. --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/wined3d_main.c | 9 +++++---- dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d1f851a..f5d4d3e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -268,7 +268,7 @@ static BOOL WineD3D_CreateFakeGLContext(void) { wined3d_fake_gl_context_foreign = FALSE; /* We need a fake window as a hdc retrieved using GetDC(0) can't be used for much GL purposes */ - wined3d_fake_gl_context_hwnd = CreateWindowA("WineD3D_OpenGL", "WineD3D fake window", WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL); + wined3d_fake_gl_context_hwnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL); if(!wined3d_fake_gl_context_hwnd) { ERR("HWND creation failed!\n"); goto fail; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 687fe89..2775dc9 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -117,9 +117,9 @@ static BOOL wined3d_init(HINSTANCE hInstDLL) wc.hCursor = LoadCursorA(NULL, (LPCSTR)IDC_ARROW); wc.hbrBackground = NULL; wc.lpszMenuName = NULL; - wc.lpszClassName = "WineD3D_OpenGL"; + wc.lpszClassName = WINED3D_OPENGL_WINDOW_CLASS_NAME; - if (!RegisterClassA(&wc) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS) + if (!RegisterClassA(&wc)) { ERR("Failed to register window class 'WineD3D_OpenGL'!\n"); return FALSE; @@ -320,9 +320,10 @@ static BOOL wined3d_init(HINSTANCE hInstDLL) return TRUE; } -static BOOL wined3d_destroy(void) +static BOOL wined3d_destroy(HINSTANCE hInstDLL) { HeapFree(GetProcessHeap(), 0, wined3d_settings.logo); + UnregisterClassA(WINED3D_OPENGL_WINDOW_CLASS_NAME, hInstDLL); return TRUE; } @@ -338,7 +339,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return wined3d_init(hInstDLL); case DLL_PROCESS_DETACH: - return wined3d_destroy(); + return wined3d_destroy(hInstDLL); default: return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cbefa9a..8c29d3a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2818,4 +2818,8 @@ static inline BOOL use_ps(IWineD3DStateBlockImpl *stateblock) void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED3DRECT *src_rect, IWineD3DSurface *dst_surface, WINED3DRECT *dst_rect, const WINED3DTEXTUREFILTERTYPE filter, BOOL flip); + +/* The WNDCLASS-Name for the fake window which we use to retrieve the GL capabilities */ +#define WINED3D_OPENGL_WINDOW_CLASS_NAME "WineD3D_OpenGL" + #endif

1 0

Paul TBBle Hampson : gdi32: Autopopulate FontLinks when autopopulating FontSubstitutes.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 87cd36db5e3e7f389765b9ff4538df0effa9f6c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87cd36db5e3e7f389765b9ff4… Author: Paul TBBle Hampson <Paul.Hampson(a)Pobox.com> Date: Sun May 10 03:12:40 2009 +1000 gdi32: Autopopulate FontLinks when autopopulating FontSubstitutes. When Wine's codepage changes, FontSubstitutes is redefined to use fonts appropriate for that codepage. Configure FontLinks to reasonable defaults at the same time. --- dlls/gdi32/freetype.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 183 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7b0afa8..60c5f21 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -400,6 +400,16 @@ static const WCHAR * const SystemFontValues[4] = { static const WCHAR external_fonts_reg_key[] = {'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\', 'F','o','n','t','s','\\','E','x','t','e','r','n','a','l',' ','F','o','n','t','s','\0'}; +/* Interesting and well-known (frequently-assumed!) font names */ +static const WCHAR Lucida_Sans_Unicode[] = {'L','u','c','i','d','a',' ','S','a','n','s',' ','U','n','i','c','o','d','e',0}; +static const WCHAR Microsoft_Sans_Serif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f',0 }; +static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0}; +static const WCHAR MS_UI_Gothic[] = {'M','S',' ','U','I',' ','G','o','t','h','i','c',0}; +static const WCHAR SimSun[] = {'S','i','m','S','u','n',0}; +static const WCHAR Gulim[] = {'G','u','l','i','m',0}; +static const WCHAR PMingLiU[] = {'P','M','i','n','g','L','i','U',0}; +static const WCHAR Batang[] = {'B','a','t','a','n','g',0}; + static const WCHAR ArabicW[] = {'A','r','a','b','i','c','\0'}; static const WCHAR BalticW[] = {'B','a','l','t','i','c','\0'}; static const WCHAR CHINESE_BIG5W[] = {'C','H','I','N','E','S','E','_','B','I','G','5','\0'}; @@ -482,6 +492,11 @@ static BOOL use_default_fallback = FALSE; static BOOL get_glyph_index_linked(GdiFont *font, UINT c, GdiFont **linked_font, FT_UInt *glyph); +static const WCHAR system_link[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s',' ','N','T','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','F','o','n','t','L','i','n','k','\\', + 'S','y','s','t','e','m','L','i','n','k',0}; + /**************************************** * Notes on .fon files * @@ -1622,10 +1637,6 @@ static void LoadReplaceList(void) */ static BOOL init_system_links(void) { - static const WCHAR system_link[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\', - 'W','i','n','d','o','w','s',' ','N','T','\\', - 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','F','o','n','t','L','i','n','k','\\', - 'S','y','s','t','e','m','L','i','n','k',0}; HKEY hkey; BOOL ret = FALSE; DWORD type, max_val, max_data, val_len, data_len, index; @@ -1633,7 +1644,6 @@ static BOOL init_system_links(void) WCHAR *entry, *next; SYSTEM_LINKS *font_link, *system_font_link; CHILD_FONT *child_font; - static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0}; static const WCHAR tahoma_ttf[] = {'t','a','h','o','m','a','.','t','t','f',0}; static const WCHAR System[] = {'S','y','s','t','e','m',0}; FONTSIGNATURE fs; @@ -2313,6 +2323,46 @@ static const struct nls_update_font_list } }; +static const WCHAR *font_links_list[] = +{ + Lucida_Sans_Unicode, + Microsoft_Sans_Serif, + Tahoma +}; + +static const struct font_links_defaults_list +{ + /* Keyed off substitution for "MS Shell Dlg" */ + const WCHAR *shelldlg; + /* Maximum of four substitutes, plus terminating NULL pointer */ + const WCHAR *substitutes[5]; +} font_links_defaults_list[] = +{ + /* Non East-Asian */ + { Tahoma, /* FIXME unverified ordering */ + { MS_UI_Gothic, SimSun, Gulim, PMingLiU, NULL } + }, + /* Below lists are courtesy of + * http://blogs.msdn.com/michkap/archive/2005/06/18/430507.aspx + */ + /* Japanese */ + { MS_UI_Gothic, + { MS_UI_Gothic, PMingLiU, SimSun, Gulim, NULL } + }, + /* Chinese Simplified */ + { SimSun, + { SimSun, PMingLiU, MS_UI_Gothic, Batang, NULL } + }, + /* Korean */ + { Gulim, + { Gulim, PMingLiU, MS_UI_Gothic, SimSun, NULL } + }, + /* Chinese Traditional */ + { PMingLiU, + { PMingLiU, SimSun, MS_UI_Gothic, Batang, NULL } + } +}; + static inline BOOL is_dbcs_ansi_cp(UINT ansi_cp) { return ( ansi_cp == 932 /* CP932 for Japanese */ @@ -2459,6 +2509,133 @@ static void update_font_info(void) } if (!done) FIXME("there is no font defaults for codepages %u,%u\n", ansi_cp, oem_cp); + + /* Clear out system links */ + RegDeleteKeyW(HKEY_LOCAL_MACHINE, system_link); +} + +static void populate_system_links(HKEY hkey, const WCHAR *name, const WCHAR *const *values) +{ + const WCHAR *value; + int i; + FontSubst *psub; + Family *family; + Face *face; + const char *file; + WCHAR *fileW; + int fileLen; + WCHAR buff[MAX_PATH]; + WCHAR *data; + int entryLen; + + static const WCHAR comma[] = {',',0}; + + RegDeleteValueW(hkey, name); + if (values) + { + data = buff; + data[0] = '\0'; + for (i = 0; values[i] != NULL; i++) + { + value = values[i]; + if (!strcmpiW(name,value)) + continue; + psub = get_font_subst(&font_subst_list, value, -1); + if(psub) + value = psub->to.name; + family = find_family_from_name(value); + if (!family) + continue; + file = NULL; + /* Use first extant filename for this Family */ + LIST_FOR_EACH_ENTRY(face, &family->faces, Face, entry) + { + if (!face->file) + continue; + file = strrchr(face->file, '/'); + if (!file) + file = face->file; + else + file++; + break; + } + if (!file) + continue; + fileLen = MultiByteToWideChar(CP_UNIXCP, 0, file, -1, NULL, 0); + fileW = HeapAlloc(GetProcessHeap(), 0, fileLen * sizeof(WCHAR)); + MultiByteToWideChar(CP_UNIXCP, 0, file, -1, fileW, fileLen); + entryLen = strlenW(fileW) + 1 + strlenW(value) + 1; + if (sizeof(buff)-(data-buff) < entryLen + 1) + { + WARN("creating SystemLink for %s, ran out of buffer space\n", debugstr_w(name)); + HeapFree(GetProcessHeap(), 0, fileW); + break; + } + strcpyW(data, fileW); + strcatW(data, comma); + strcatW(data, value); + data += entryLen; + TRACE("added SystemLink for %s to %s in %s\n", debugstr_w(name), debugstr_w(value),debugstr_w(fileW)); + HeapFree(GetProcessHeap(), 0, fileW); + } + if (data != buff) + { + *data='\0'; + data++; + RegSetValueExW(hkey, name, 0, REG_MULTI_SZ, (BYTE*)buff, (data-buff) * sizeof(WCHAR)); + } else + TRACE("no SystemLink fonts found for %s\n", debugstr_w(name)); + } else + TRACE("removed SystemLink for %s\n", debugstr_w(name)); +} + +static void update_system_links(void) +{ + HKEY hkey = 0; + UINT i, j; + BOOL done = FALSE; + DWORD disposition; + FontSubst *psub; + + static const WCHAR MS_Shell_Dlg[] = {'M','S',' ','S','h','e','l','l',' ','D','l','g',0}; + + if (!RegCreateKeyExW(HKEY_LOCAL_MACHINE, system_link, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &hkey, &disposition)) + { + if (disposition == REG_OPENED_EXISTING_KEY) + { + TRACE("SystemLink key already exists, doing nothing\n"); + RegCloseKey(hkey); + return; + } + + psub = get_font_subst(&font_subst_list, MS_Shell_Dlg, -1); + if (!psub) { + WARN("could not find FontSubstitute for MS Shell Dlg\n"); + RegCloseKey(hkey); + return; + } + + for (i = 0; i < sizeof(font_links_defaults_list)/sizeof(font_links_defaults_list[0]); i++) + { + if (!strcmpiW(font_links_defaults_list[i].shelldlg, psub->to.name)) + { + for (j = 0; j < sizeof(font_links_list)/sizeof(font_links_list[0]); j++) + populate_system_links(hkey, font_links_list[j], font_links_defaults_list[i].substitutes); + + if (!strcmpiW(psub->to.name, font_links_defaults_list[i].substitutes[0])) + populate_system_links(hkey, psub->to.name, font_links_defaults_list[i].substitutes); + done = TRUE; + } + else if (strcmpiW(psub->to.name, font_links_defaults_list[i].substitutes[0])) + { + populate_system_links(hkey, font_links_defaults_list[i].substitutes[0], NULL); + } + } + RegCloseKey(hkey); + if (!done) + WARN("there is no SystemLink default list for MS Shell Dlg %s\n", debugstr_w(psub->to.name)); + } else + WARN("failed to create SystemLink key\n"); } @@ -2701,6 +2878,7 @@ BOOL WineEngInit(void) LoadReplaceList(); update_reg_entries(); + update_system_links(); init_system_links(); ReleaseMutex(font_mutex);

1 0

Huw Davies : ole32/tests: Make the size tests for the WdtpInterfacePointer marshaller more restrictive .
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 782ec11a0df59dc8a6f4088d12e7ec9b681ead79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=782ec11a0df59dc8a6f4088d1… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue May 12 11:31:10 2009 +0100 ole32/tests: Make the size tests for the WdtpInterfacePointer marshaller more restrictive. --- dlls/ole32/tests/usrmarshal.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/usrmarshal.c b/dlls/ole32/tests/usrmarshal.c index 3411cc2..51223e5 100644 --- a/dlls/ole32/tests/usrmarshal.c +++ b/dlls/ole32/tests/usrmarshal.c @@ -530,14 +530,15 @@ static void test_marshal_WdtpInterfacePointer(void) init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, NULL, 0, MSHCTX_INPROC); size = WdtpInterfacePointer_UserSize(&umcb.Flags, umcb.Flags, 0, unk, &IID_IUnknown); todo_wine - ok(size > 28, "size should be > 28 bytes, not %d\n", size); + ok(size >= 0x4c, "size should be >= 0x4c bytes, not %d\n", size); trace("WdtpInterfacePointer_UserSize returned %d\n", size); buffer = HeapAlloc(GetProcessHeap(), 0, size); init_user_marshal_cb(&umcb, &stub_msg, &rpc_msg, buffer, size, MSHCTX_INPROC); buffer_end = WdtpInterfacePointer_UserMarshal(&umcb.Flags, umcb.Flags, buffer, unk, &IID_IUnknown); wireip = buffer; - if (size >= 28) + if (size >= 0x4c) { + ok(buffer_end == buffer + 0x4c, "buffer_end %p buffer %p\n", buffer_end, buffer); ok(*(DWORD *)wireip == 0x44, "wireip + 0x0 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip); wireip += sizeof(DWORD); ok(*(DWORD *)wireip == 0x44, "wireip + 0x4 should be 0x44 instead of 0x%08x\n", *(DWORD *)wireip);

1 0

Henri Verbeet : wined3d: Don' t create more than WINED3D_MAX_FBO_ENTRIES FBO entries.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 0d446053da05567177da12371633336ed2add9d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d446053da05567177da12371… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 11 16:43:49 2009 +0200 wined3d: Don't create more than WINED3D_MAX_FBO_ENTRIES FBO entries. This essentially turns the FBO entry list into an LRU cache. --- dlls/wined3d/context.c | 44 +++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 3 ++ 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2c6703f..8a4296d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -53,12 +53,10 @@ void context_bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo) checkGLcall("glBindFramebuffer()"); } -static void context_destroy_fbo(IWineD3DDeviceImpl *This, const GLuint *fbo) +static void context_clean_fbo_attachments(IWineD3DDeviceImpl *This) { unsigned int i; - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, *fbo)); - checkGLcall("glBindFramebuffer()"); for (i = 0; i < GL_LIMITS(buffers); ++i) { GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT + i, GL_TEXTURE_2D, 0, 0)); @@ -66,6 +64,15 @@ static void context_destroy_fbo(IWineD3DDeviceImpl *This, const GLuint *fbo) } GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0)); checkGLcall("glFramebufferTexture2D()"); +} + +static void context_destroy_fbo(IWineD3DDeviceImpl *This, const GLuint *fbo) +{ + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, *fbo)); + checkGLcall("glBindFramebuffer()"); + + context_clean_fbo_attachments(This); + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); checkGLcall("glBindFramebuffer()"); GL_EXTCALL(glDeleteFramebuffersEXT(1, fbo)); @@ -230,6 +237,19 @@ static struct fbo_entry *context_create_fbo_entry(IWineD3DDevice *iface) return entry; } +static void context_reuse_fbo_entry(IWineD3DDevice *iface, struct fbo_entry *entry) +{ + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, entry->id)); + checkGLcall("glBindFramebuffer()"); + context_clean_fbo_attachments(This); + + memcpy(entry->render_targets, This->render_targets, GL_LIMITS(buffers) * sizeof(*entry->render_targets)); + entry->depth_stencil = This->stencilBufferTarget; + entry->attached = FALSE; +} + static void context_destroy_fbo_entry(IWineD3DDeviceImpl *This, struct fbo_entry *entry) { if (entry->id) @@ -253,12 +273,26 @@ static struct fbo_entry *context_find_fbo_entry(IWineD3DDevice *iface, WineD3DCo if (!memcmp(entry->render_targets, This->render_targets, GL_LIMITS(buffers) * sizeof(*entry->render_targets)) && entry->depth_stencil == This->stencilBufferTarget) { + list_remove(&entry->entry); + list_add_head(&context->fbo_list, &entry->entry); return entry; } } - entry = context_create_fbo_entry(iface); - list_add_head(&context->fbo_list, &entry->entry); + if (context->fbo_entry_count < WINED3D_MAX_FBO_ENTRIES) + { + entry = context_create_fbo_entry(iface); + list_add_head(&context->fbo_list, &entry->entry); + ++context->fbo_entry_count; + } + else + { + entry = LIST_ENTRY(list_tail(&context->fbo_list), struct fbo_entry, entry); + context_reuse_fbo_entry(iface, entry); + list_remove(&entry->entry); + list_add_head(&context->fbo_list, &entry->entry); + } + return entry; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c227e9c..cbefa9a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1167,6 +1167,8 @@ enum fogsource { FOGSOURCE_COORD, }; +#define WINED3D_MAX_FBO_ENTRIES 64 + /* The new context manager that should deal with onscreen and offscreen rendering */ struct WineD3DContext { /* State dirtification @@ -1214,6 +1216,7 @@ struct WineD3DContext { GLint aux_buffers; /* FBOs */ + UINT fbo_entry_count; struct list fbo_list; struct fbo_entry *current_fbo; GLuint src_fbo;

1 0

Jacek Caban : urlmon: Added support for PI_APARTMENTTHREADED to BindProtocol::Switch.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: e487196dc2ec499ac11a0e99d9919db799a03f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e487196dc2ec499ac11a0e99d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 21:59:31 2009 +0200 urlmon: Added support for PI_APARTMENTTHREADED to BindProtocol::Switch. --- dlls/urlmon/binding.c | 7 ++- dlls/urlmon/bindprot.c | 117 ++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/urlmon_main.h | 6 ++ 3 files changed, 126 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index f8ad73a..4b8651c 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -192,6 +192,9 @@ static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM IBinding_Release(BINDING(binding)); return 0; } + case WM_MK_CONTINUE2: + handle_bindprot_task((void*)lParam); + return 0; case WM_MK_RELEASE: { tls_data_t *data = get_tls_data(); @@ -205,7 +208,7 @@ static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM return DefWindowProcW(hwnd, msg, wParam, lParam); } -static HWND get_notif_hwnd(void) +HWND get_notif_hwnd(void) { static ATOM wnd_class = 0; tls_data_t *tls_data; @@ -250,7 +253,7 @@ static HWND get_notif_hwnd(void) return tls_data->notif_hwnd; } -static void release_notif_hwnd(HWND hwnd) +void release_notif_hwnd(HWND hwnd) { tls_data_t *data = get_tls_data(); diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 1f24594..eaee9b6 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -21,7 +21,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); -typedef struct { +typedef struct BindProtocol BindProtocol; + +struct _task_header_t; + +typedef void (*task_proc_t)(BindProtocol*,struct _task_header_t*); + +typedef struct _task_header_t { + task_proc_t proc; + struct _task_header_t *next; +} task_header_t; + +struct BindProtocol { const IInternetProtocolVtbl *lpInternetProtocolVtbl; const IInternetBindInfoVtbl *lpInternetBindInfoVtbl; const IInternetPriorityVtbl *lpInternetPriorityVtbl; @@ -40,7 +51,15 @@ typedef struct { BOOL reported_result; BOOL from_urlmon; -} BindProtocol; + DWORD pi; + + DWORD apartment_thread; + HWND notif_hwnd; + DWORD continue_call; + + CRITICAL_SECTION section; + task_header_t *task_queue_head, *task_queue_tail; +}; #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) #define BINDINFO(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl) @@ -48,6 +67,64 @@ typedef struct { #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define PROTSINK(x) ((IInternetProtocolSink*) &(x)->lpInternetProtocolSinkVtbl) +void handle_bindprot_task(void *v) +{ + BindProtocol *This = v; + task_header_t *task; + + while(1) { + EnterCriticalSection(&This->section); + + task = This->task_queue_head; + if(task) { + This->task_queue_head = task->next; + if(!This->task_queue_head) + This->task_queue_tail = NULL; + } + + LeaveCriticalSection(&This->section); + + if(!task) + break; + + This->continue_call++; + task->proc(This, task); + This->continue_call--; + } + + IInternetProtocol_Release(PROTOCOL(This)); +} + +static void push_task(BindProtocol *This, task_header_t *task, task_proc_t proc) +{ + BOOL do_post = FALSE; + + task->proc = proc; + task->next = NULL; + + EnterCriticalSection(&This->section); + + if(This->task_queue_tail) { + This->task_queue_tail->next = task; + This->task_queue_tail = task; + }else { + This->task_queue_tail = This->task_queue_head = task; + do_post = TRUE; + } + + LeaveCriticalSection(&This->section); + + if(do_post) { + IInternetProtocol_AddRef(PROTOCOL(This)); + PostMessageW(This->notif_hwnd, WM_MK_CONTINUE2, 0, (LPARAM)This); + } +} + +static BOOL inline do_direct_notif(BindProtocol *This) +{ + return !(This->pi & PI_APARTMENTTHREADED) || (This->apartment_thread == GetCurrentThreadId() && !This->continue_call); +} + #define PROTOCOL_THIS(iface) DEFINE_THIS(BindProtocol, InternetProtocol, iface) static HRESULT WINAPI BindProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) @@ -113,6 +190,10 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocol *iface) IInternetBindInfo_Release(This->bind_info); set_binding_sink(PROTOCOL(This), NULL); + + if(This->notif_hwnd) + release_notif_hwnd(This->notif_hwnd); + DeleteCriticalSection(&This->section); heap_free(This); URLMON_UnlockModule(); @@ -140,6 +221,8 @@ static HRESULT WINAPI BindProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl if(!szUrl || !pOIProtSink || !pOIBindInfo) return E_INVALIDARG; + This->pi = grfPI; + hres = IInternetProtocolSink_QueryInterface(pOIProtSink, &IID_IServiceProvider, (void**)&service_provider); if(SUCCEEDED(hres)) { @@ -468,6 +551,20 @@ static ULONG WINAPI BPInternetProtocolSink_Release(IInternetProtocolSink *iface) return IInternetProtocol_Release(PROTOCOL(This)); } +typedef struct { + task_header_t header; + PROTOCOLDATA data; +} switch_task_t; + +static void switch_proc(BindProtocol *bind, task_header_t *t) +{ + switch_task_t *task = (switch_task_t*)t; + + IInternetProtocol_Continue(bind->protocol, &task->data); + + heap_free(task); +} + static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOLDATA *pProtocolData) { @@ -478,6 +575,19 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface TRACE("flags %x state %x data %p cb %u\n", pProtocolData->grfFlags, pProtocolData->dwState, pProtocolData->pData, pProtocolData->cbData); + if(!do_direct_notif(This)) { + switch_task_t *task; + + task = heap_alloc(sizeof(switch_task_t)); + if(!task) + return E_OUTOFMEMORY; + + task->data = *pProtocolData; + + push_task(This, &task->header, switch_proc); + return S_OK; + } + if(!This->protocol_sink) { IInternetProtocol_Continue(This->protocol, pProtocolData); return S_OK; @@ -615,6 +725,9 @@ HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol ret->ref = 1; ret->from_urlmon = from_urlmon; + ret->apartment_thread = GetCurrentThreadId(); + ret->notif_hwnd = get_notif_hwnd(); + InitializeCriticalSection(&ret->section); URLMON_LockModule(); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index aa2f276..13eb4f3 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -116,6 +116,12 @@ typedef struct { tls_data_t *get_tls_data(void); +HWND get_notif_hwnd(void); +void release_notif_hwnd(HWND); + +#define WM_MK_CONTINUE2 (WM_USER+103) +void handle_bindprot_task(void*); + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len);

1 0

Jacek Caban : urlmon: Added support for PI_APARTMENTTHREADED to BindProtocol::ReportProgress.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 2dee8bb79d326d17ef5791112a4680e95f07eaa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dee8bb79d326d17ef5791112… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 21:59:54 2009 +0200 urlmon: Added support for PI_APARTMENTTHREADED to BindProtocol::ReportProgress. --- dlls/urlmon/bindprot.c | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index eaee9b6..de00e94 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -596,6 +596,39 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface return IInternetProtocolSink_Switch(This->protocol_sink, pProtocolData); } +typedef struct { + task_header_t header; + + ULONG status_code; + LPWSTR status_text; +} on_progress_task_t; + +static void on_progress_proc(BindProtocol *This, task_header_t *t) +{ + on_progress_task_t *task = (on_progress_task_t*)t; + + IInternetProtocolSink_ReportProgress(This->protocol_sink, task->status_code, task->status_text); + + heap_free(task->status_text); + heap_free(task); +} + +static void report_progress(BindProtocol *This, ULONG status_code, LPCWSTR status_text) +{ + if(do_direct_notif(This)) { + IInternetProtocolSink_ReportProgress(This->protocol_sink, status_code, status_text); + }else { + on_progress_task_t *task; + + task = heap_alloc(sizeof(on_progress_task_t)); + + task->status_code = status_code; + task->status_text = heap_strdupW(status_text); + + push_task(This, &task->header, on_progress_proc); + } +} + static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSink *iface, ULONG ulStatusCode, LPCWSTR szStatusText) { @@ -614,20 +647,23 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSin case BINDSTATUS_MIMETYPEAVAILABLE: if(!This->protocol_sink) return S_OK; - return IInternetProtocolSink_ReportProgress(This->protocol_sink, - ulStatusCode, szStatusText); + report_progress(This, ulStatusCode, szStatusText); + break; case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: if(!This->protocol_sink) return S_OK; - return IInternetProtocolSink_ReportProgress(This->protocol_sink, + report_progress(This, This->from_urlmon ? BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE : BINDSTATUS_MIMETYPEAVAILABLE, - szStatusText); + szStatusText); + break; + default: FIXME("unsupported ulStatusCode %u\n", ulStatusCode); + return E_NOTIMPL; } - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI BPInternetProtocolSink_ReportData(IInternetProtocolSink *iface,

1 0

Jacek Caban : urlmon: Added PI_APARTMENTTHREADED support to BindProtocol:: ReportProgress.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 8ca4a4a3a45194de1a7b54191e6f3b081c543521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca4a4a3a45194de1a7b54191… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 22:00:13 2009 +0200 urlmon: Added PI_APARTMENTTHREADED support to BindProtocol::ReportProgress. --- dlls/urlmon/bindprot.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index de00e94..13e9b98 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -666,6 +666,23 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSin return S_OK; } +typedef struct { + task_header_t header; + DWORD bscf; + ULONG progress; + ULONG progress_max; +} report_data_task_t; + +static void report_data_proc(BindProtocol *This, task_header_t *t) +{ + report_data_task_t *task = (report_data_task_t*)t; + + if(This->protocol_sink) + IInternetProtocolSink_ReportData(This->protocol_sink, task->bscf, task->progress, task->progress_max); + + heap_free(task); +} + static HRESULT WINAPI BPInternetProtocolSink_ReportData(IInternetProtocolSink *iface, DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) { @@ -676,6 +693,21 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportData(IInternetProtocolSink *i if(!This->protocol_sink) return S_OK; + if(!do_direct_notif(This)) { + report_data_task_t *task; + + task = heap_alloc(sizeof(report_data_task_t)); + if(!task) + return E_OUTOFMEMORY; + + task->bscf = grfBSCF; + task->progress = ulProgress; + task->progress_max = ulProgressMax; + + push_task(This, &task->header, report_data_proc); + return S_OK; + } + return IInternetProtocolSink_ReportData(This->protocol_sink, grfBSCF, ulProgress, ulProgressMax); }

1 0

Jacek Caban : urlmon: Added PI_APARTMENTTHREADED support to BindProtocol:: ReportResult.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 7de802eb0f50e2739afa408158cc09fccbaec34d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de802eb0f50e2739afa40815… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 22:00:26 2009 +0200 urlmon: Added PI_APARTMENTTHREADED support to BindProtocol::ReportResult. --- dlls/urlmon/bindprot.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 13e9b98..9203755 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -711,6 +711,25 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportData(IInternetProtocolSink *i return IInternetProtocolSink_ReportData(This->protocol_sink, grfBSCF, ulProgress, ulProgressMax); } +typedef struct { + task_header_t header; + + HRESULT hres; + DWORD err; + LPWSTR str; +} report_result_task_t; + +static void report_result_proc(BindProtocol *This, task_header_t *t) +{ + report_result_task_t *task = (report_result_task_t*)t; + + if(This->protocol_sink) + IInternetProtocolSink_ReportResult(This->protocol_sink, task->hres, task->err, task->str); + + heap_free(task->str); + heap_free(task); +} + static HRESULT WINAPI BPInternetProtocolSink_ReportResult(IInternetProtocolSink *iface, HRESULT hrResult, DWORD dwError, LPCWSTR szResult) { @@ -723,6 +742,21 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportResult(IInternetProtocolSink This->reported_result = TRUE; + if(!do_direct_notif(This)) { + report_result_task_t *task; + + task = heap_alloc(sizeof(report_result_task_t)); + if(!task) + return E_OUTOFMEMORY; + + task->hres = hrResult; + task->err = dwError; + task->str = heap_strdupW(szResult); + + push_task(This, &task->header, report_result_proc); + return S_OK; + } + return IInternetProtocolSink_ReportResult(This->protocol_sink, hrResult, dwError, szResult); }

1 0

Jacek Caban : urlmon: Use PI_APARTMENTTHREADED in Binding object.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 2e75a84e17bb9305858ed54b30d377e8f7497533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e75a84e17bb9305858ed54b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 22:00:41 2009 +0200 urlmon: Use PI_APARTMENTTHREADED in Binding object. --- dlls/urlmon/binding.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 4b8651c..cd843b4 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1789,7 +1789,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, I report_data(binding, 0, 0, 0); }else { hres = IInternetProtocol_Start(binding->protocol, url, PROTSINK(binding), - BINDINF(binding), 0, 0); + BINDINF(binding), PI_APARTMENTTHREADED, 0); TRACE("start ret %08x\n", hres);

1 0