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

Alexandre Julliard : user32/tests: Fix the LB_DELETESTRING for older Windows versions.
by Alexandre Julliard May 12, 2009

May 12, 2009

Module: wine Branch: master Commit: 2c882507daa2b992331c54adc13e6d2e59675894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c882507daa2b992331c54adc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 12 12:09:07 2009 +0200 user32/tests: Fix the LB_DELETESTRING for older Windows versions. --- dlls/user32/tests/msg.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 2445f82..782ab8a 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11020,14 +11020,18 @@ static const struct message wm_lb_click_0[] = static const struct message wm_lb_deletestring[] = { { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, - { WM_DELETEITEM, sent|wparam|parent, ID_LISTBOX, 0 }, + { WM_DELETEITEM, sent|wparam|parent|optional, ID_LISTBOX, 0 }, + { WM_DRAWITEM, sent|wparam|parent|optional, ID_LISTBOX }, + { WM_DRAWITEM, sent|wparam|parent|optional, ID_LISTBOX }, { 0 } }; static const struct message wm_lb_deletestring_reset[] = { { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, - { LB_RESETCONTENT, sent|wparam|lparam|defwinproc, 0, 0 }, - { WM_DELETEITEM, sent|wparam|parent, ID_LISTBOX, 0 }, + { LB_RESETCONTENT, sent|wparam|lparam|defwinproc|optional, 0, 0 }, + { WM_DELETEITEM, sent|wparam|parent|optional, ID_LISTBOX, 0 }, + { WM_DRAWITEM, sent|wparam|parent|optional, ID_LISTBOX }, + { WM_DRAWITEM, sent|wparam|parent|optional, ID_LISTBOX }, { 0 } };

1 0

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

May 12, 2009

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 May 12, 2009

May 12, 2009

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

Nikolay Sivov : comctl32/listview: A couple of tests for changing item attributes.
by Alexandre Julliard May 12, 2009

May 12, 2009

Module: wine Branch: master Commit: bad1dda9ad1f3299e6f7d3b6f4d01bbfe7299d04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bad1dda9ad1f3299e6f7d3b6f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue May 12 01:16:12 2009 +0400 comctl32/listview: A couple of tests for changing item attributes. --- dlls/comctl32/tests/listview.c | 62 ++++++++++++++++++++++++++++++++++++++++ dlls/comctl32/tests/msg.h | 3 +- 2 files changed, 64 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5987e1e..43eb274 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -168,6 +168,18 @@ static const struct message forward_erasebkgnd_parent_seq[] = { { 0 } }; +static const struct message ownderdata_select_focus_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { WM_NOTIFY, sent|id, 0, 0, LVN_GETDISPINFOA }, + { 0 } +}; + +static const struct message textcallback_set_again_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { 0 } +}; + struct subclass_info { WNDPROC oldproc; @@ -184,6 +196,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP if (defwndproc_counter) msg.flags |= defwinproc; msg.wParam = wParam; msg.lParam = lParam; + if (message == WM_NOTIFY && lParam) msg.id = ((NMHDR*)lParam)->code; /* log system messages, except for painting */ if (message < WM_USER && @@ -827,6 +840,26 @@ static void test_items(void) r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); ok(r != 0, "ret %d\n", r); + /* set text to callback value already having it */ + r = SendMessage(hwnd, LVM_DELETEALLITEMS, 0, 0); + expect(TRUE, r); + memset (&item, 0, sizeof (item)); + item.mask = LVIF_TEXT; + item.pszText = LPSTR_TEXTCALLBACK; + item.iItem = 0; + r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); + ok(r == 0, "ret %d\n", r); + memset (&item, 0, sizeof (item)); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + item.pszText = LPSTR_TEXTCALLBACK; + r = SendMessage(hwnd, LVM_SETITEMTEXT, 0 , (LPARAM) &item); + expect(TRUE, r); + + ok_sequence(sequences, PARENT_SEQ_INDEX, textcallback_set_again_parent_seq, + "check callback text comparison rule", TRUE); + DestroyWindow(hwnd); } @@ -1983,6 +2016,35 @@ static void test_ownerdata(void) res = SendMessageA(hwnd, LVM_SETITEM, 0, (LPARAM)&item); expect(FALSE, res); DestroyWindow(hwnd); + + /* check notifications after focused/selected changed */ + hwnd = create_listview_control(LVS_OWNERDATA); + ok(hwnd != NULL, "failed to create a listview window\n"); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + ok(res != 0, "Expected LVM_SETITEMCOUNT to succeed\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + + ok_sequence(sequences, PARENT_SEQ_INDEX, ownderdata_select_focus_parent_seq, + "ownerdata select notification", TRUE); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_FOCUSED; + item.state = LVIS_FOCUSED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, res); + + ok_sequence(sequences, PARENT_SEQ_INDEX, ownderdata_select_focus_parent_seq, + "ownerdata focus notification", TRUE); + DestroyWindow(hwnd); } static void test_norecompute(void) diff --git a/dlls/comctl32/tests/msg.h b/dlls/comctl32/tests/msg.h index 2ec3ea1..16ab542 100644 --- a/dlls/comctl32/tests/msg.h +++ b/dlls/comctl32/tests/msg.h @@ -47,7 +47,8 @@ struct message msg_flags_t flags; /* message props */ WPARAM wParam; /* expected value of wParam */ LPARAM lParam; /* expected value of lParam */ - UINT id; /* id of the window */ + UINT id; /* extra message data: id of the window, + notify code etc. */ }; struct msg_sequence

1 0

Roderick Colenbrander : opengl32: Add a wglShareLists test.
by Alexandre Julliard May 12, 2009

May 12, 2009

Module: wine Branch: master Commit: 03c6a0d9d1ba17be8ba8ea15b167bd2b80e915da URL: http://source.winehq.org/git/wine.git/?a=commit;h=03c6a0d9d1ba17be8ba8ea15b… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon May 11 22:12:10 2009 +0200 opengl32: Add a wglShareLists test. --- dlls/opengl32/tests/opengl.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 54 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 49659eb..48a75f8 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -285,6 +285,59 @@ static void test_setpixelformat(HDC winhdc) } } +static void test_sharelists(HDC winhdc) +{ + HGLRC hglrc1, hglrc2, hglrc3; + int res; + + hglrc1 = wglCreateContext(winhdc); + res = wglShareLists(0, 0); + ok(res == FALSE, "Sharing display lists for no contexts passed!\n"); + + /* Test 1: Create a context and just share lists without doing anything special */ + hglrc2 = wglCreateContext(winhdc); + if(hglrc2) + { + res = wglShareLists(hglrc1, hglrc2); + ok(res, "Sharing of display lists failed\n"); + wglDeleteContext(hglrc2); + } + + /* Test 2: Share display lists with a 'destination' context which has been made current */ + hglrc2 = wglCreateContext(winhdc); + if(hglrc2) + { + res = wglMakeCurrent(winhdc, hglrc2); + ok(res, "Make current failed\n"); + res = wglShareLists(hglrc1, hglrc2); + todo_wine ok(res, "Sharing display lists with a destination context which has been made current passed\n"); + wglMakeCurrent(0, 0); + wglDeleteContext(hglrc2); + } + + /* Test 3: Share display lists with a context which already shares display lists with another context. + * According to MSDN the second paramater can't share any display lists but some buggy drivers might allow it */ + hglrc3 = wglCreateContext(winhdc); + if(hglrc3) + { + res = wglShareLists(hglrc3, hglrc1); + ok(res == FALSE, "Sharing of display lists failed for a context which already shared lists before\n"); + wglDeleteContext(hglrc3); + } + + /* Test 4: Share display lists with a 'source' context which has been made current */ + hglrc2 = wglCreateContext(winhdc); + if(hglrc2) + { + res = wglMakeCurrent(winhdc, hglrc1); + ok(res, "Make current failed\n"); + res = wglShareLists(hglrc1, hglrc2); + ok(res, "Sharing display lists with a source context which has been made current passed\n"); + wglMakeCurrent(0, 0); + wglDeleteContext(hglrc2); + } +} + static void test_makecurrent(HDC winhdc) { BOOL ret; @@ -601,6 +654,7 @@ START_TEST(opengl) test_makecurrent(hdc); test_setpixelformat(hdc); + test_sharelists(hdc); test_colorbits(hdc); test_gdi_dbuf(hdc);

1 0

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

May 12, 2009

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: Get rid of no longer needed thread checking in Binding object' s ReportData and ReportResult implementation.
by Alexandre Julliard May 12, 2009

May 12, 2009

Module: wine Branch: master Commit: 8ea07306e128a10b1d92fbff5f757fc12e13aeb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ea07306e128a10b1d92fbff5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 22:01:39 2009 +0200 urlmon: Get rid of no longer needed thread checking in Binding object's ReportData and ReportResult implementation. --- dlls/urlmon/binding.c | 64 ++---------------------------------------------- 1 files changed, 3 insertions(+), 61 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 2e07f96..60152a5 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1305,22 +1305,6 @@ static void report_data(Binding *This, DWORD bscf, ULONG progress, ULONG progres } } -typedef struct { - task_header_t header; - DWORD bscf; - ULONG progress; - ULONG progress_max; -} report_data_task_t; - -static void report_data_proc(Binding *binding, task_header_t *t) -{ - report_data_task_t *task = (report_data_task_t*)t; - - report_data(binding, task->bscf, task->progress, task->progress_max); - - heap_free(task); -} - static HRESULT WINAPI InternetProtocolSink_ReportData(IInternetProtocolSink *iface, DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) { @@ -1328,42 +1312,10 @@ static HRESULT WINAPI InternetProtocolSink_ReportData(IInternetProtocolSink *ifa TRACE("(%p)->(%d %u %u)\n", This, grfBSCF, ulProgress, ulProgressMax); - if(GetCurrentThreadId() != This->apartment_thread) - FIXME("called from worked hread\n"); - - if(This->continue_call) { - report_data_task_t *task = heap_alloc(sizeof(report_data_task_t)); - task->bscf = grfBSCF; - task->progress = ulProgress; - task->progress_max = ulProgressMax; - - push_task(This, &task->header, report_data_proc); - }else { - report_data(This, grfBSCF, ulProgress, ulProgressMax); - } - + report_data(This, grfBSCF, ulProgress, ulProgressMax); return S_OK; } -typedef struct { - task_header_t header; - - HRESULT hres; - LPWSTR str; -} report_result_task_t; - -static void report_result_proc(Binding *binding, task_header_t *t) -{ - report_result_task_t *task = (report_result_task_t*)t; - - IInternetProtocol_Terminate(binding->protocol, 0); - - stop_binding(binding, task->hres, task->str); - - heap_free(task->str); - heap_free(task); -} - static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *iface, HRESULT hrResult, DWORD dwError, LPCWSTR szResult) { @@ -1371,18 +1323,8 @@ static HRESULT WINAPI InternetProtocolSink_ReportResult(IInternetProtocolSink *i TRACE("(%p)->(%08x %d %s)\n", This, hrResult, dwError, debugstr_w(szResult)); - if(GetCurrentThreadId() == This->apartment_thread && !This->continue_call) { - IInternetProtocol_Terminate(This->protocol, 0); - stop_binding(This, hrResult, szResult); - }else { - report_result_task_t *task = heap_alloc(sizeof(report_result_task_t)); - - task->hres = hrResult; - task->str = heap_strdupW(szResult); - - push_task(This, &task->header, report_result_proc); - } - + IInternetProtocol_Terminate(This->protocol, 0); + stop_binding(This, hrResult, szResult); return S_OK; }

1 0

Jacek Caban : urlmon: Get rid of no longer needed thread checking in Binding::ReportProgress.
by Alexandre Julliard May 12, 2009

May 12, 2009

Module: wine Branch: master Commit: cd30018dbe49ea38532b6bc1feb86e8c7673b7a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd30018dbe49ea38532b6bc1f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 22:01:54 2009 +0200 urlmon: Get rid of no longer needed thread checking in Binding::ReportProgress. --- dlls/urlmon/binding.c | 91 ++----------------------------------------------- 1 files changed, 3 insertions(+), 88 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 60152a5..b49ee8c 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -127,23 +127,6 @@ struct Binding { #define WM_MK_CONTINUE (WM_USER+101) #define WM_MK_RELEASE (WM_USER+102) -static void push_task(Binding *binding, task_header_t *task, task_proc_t proc) -{ - task->proc = proc; - task->next = NULL; - - EnterCriticalSection(&binding->section); - - if(binding->task_queue_tail) { - binding->task_queue_tail->next = task; - binding->task_queue_tail = task; - }else { - binding->task_queue_tail = binding->task_queue_head = task; - } - - LeaveCriticalSection(&binding->section); -} - static task_header_t *pop_task(Binding *binding) { task_header_t *ret; @@ -353,32 +336,12 @@ static void handle_mime_available(Binding *binding, BOOL verify) binding->clipboard_format = RegisterClipboardFormatW(binding->mime); } -typedef struct { - task_header_t header; - BOOL verify; -} mime_available_task_t; - -static void mime_available_proc(Binding *binding, task_header_t *t) -{ - mime_available_task_t *task = (mime_available_task_t*)t; - - handle_mime_available(binding, task->verify); - - heap_free(task); -} - static void mime_available(Binding *This, LPCWSTR mime, BOOL verify) { if(mime) set_binding_mime(This, mime); - if(GetCurrentThreadId() == This->apartment_thread) { - handle_mime_available(This, verify); - }else { - mime_available_task_t *task = heap_alloc(sizeof(task_header_t)); - task->verify = verify; - push_task(This, &task->header, mime_available_proc); - } + handle_mime_available(This, verify); } static void stop_binding(Binding *binding, HRESULT hres, LPCWSTR str) @@ -1137,59 +1100,11 @@ static HRESULT WINAPI InternetProtocolSink_Switch(IInternetProtocolSink *iface, return E_FAIL; } -typedef struct { - task_header_t header; - - Binding *binding; - ULONG progress; - ULONG progress_max; - ULONG status_code; - LPWSTR status_text; -} on_progress_task_t; - -static void on_progress_proc(Binding *binding, task_header_t *t) -{ - on_progress_task_t *task = (on_progress_task_t*)t; - - IBindStatusCallback_OnProgress(binding->callback, task->progress, - task->progress_max, task->status_code, task->status_text); - - heap_free(task->status_text); - heap_free(task); -} - static void on_progress(Binding *This, ULONG progress, ULONG progress_max, ULONG status_code, LPCWSTR status_text) { - on_progress_task_t *task; - - if(GetCurrentThreadId() == This->apartment_thread && !This->continue_call) { - IBindStatusCallback_OnProgress(This->callback, progress, progress_max, - status_code, status_text); - return; - } - - task = heap_alloc(sizeof(on_progress_task_t)); - - task->progress = progress; - task->progress_max = progress_max; - task->status_code = status_code; - - if(status_text) { - DWORD size = (strlenW(status_text)+1)*sizeof(WCHAR); - - task->status_text = heap_alloc(size); - memcpy(task->status_text, status_text, size); - }else { - task->status_text = NULL; - } - - push_task(This, &task->header, on_progress_proc); - - if(GetCurrentThreadId() != This->apartment_thread) { - IBinding_AddRef(BINDING(This)); - PostMessageW(This->notif_hwnd, WM_MK_CONTINUE, 0, (LPARAM)This); - } + IBindStatusCallback_OnProgress(This->callback, progress, progress_max, + status_code, status_text); } static HRESULT WINAPI InternetProtocolSink_ReportProgress(IInternetProtocolSink *iface,

1 0

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

May 12, 2009

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 May 12, 2009

May 12, 2009

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