wine-commits May 2013

wine-commits@winehq.org

2 participants
498 discussions

C John Klehm : winex11.drv: Add pen to tablet stylus detection whitelist.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: d2ab8e454e61ddc8b3dd41601a74df7e52190027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ab8e454e61ddc8b3dd41601… Author: C John Klehm <cjohn(a)klehm.net> Date: Wed May 15 19:59:36 2013 -0500 winex11.drv: Add pen to tablet stylus detection whitelist. --- dlls/winex11.drv/wintab.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index a2ffa84..23a5423 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -422,6 +422,7 @@ static BOOL is_stylus(const char *name, const char *type) "stylus", "wizardpen", "acecad", + "pen", NULL };

1 0

Christian Costa : d3dxof: Fix IDirectXFileDataImpl_GetName and IDirectXFileDataReferenceImpl_GetName + tests .
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: 21525261656670fc81cc64ccf4fd6428caefdded URL: http://source.winehq.org/git/wine.git/?a=commit;h=21525261656670fc81cc64ccf… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 16 01:28:46 2013 +0200 d3dxof: Fix IDirectXFileDataImpl_GetName and IDirectXFileDataReferenceImpl_GetName + tests. --- dlls/d3dxof/d3dxof.c | 6 ++++++ dlls/d3dxof/tests/d3dxof.c | 8 ++++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 498b192..7090141 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -587,6 +587,9 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetName(IDirectXFileData* iface, LPST if (*pdwBufLen < len) return DXFILEERR_BADVALUE; CopyMemory(pstrNameBuf, This->pobj->name, len); + /* Even if we return a size of 0, an empty string with a null byte must be returned */ + if (*pdwBufLen && !len) + pstrNameBuf[0] = 0; } *pdwBufLen = len; @@ -851,6 +854,9 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_GetName(IDirectXFileDataRefe if (*pdwBufLen < len) return DXFILEERR_BADVALUE; CopyMemory(pstrNameBuf, This->ptarget->name, len); + /* Even if we return a size of 0, an empty string with a null byte must be returned */ + if (*pdwBufLen && !len) + pstrNameBuf[0] = 0; } *pdwBufLen = len; diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index f6874a4..87b7985 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -546,10 +546,18 @@ static void test_getname(void) hr = IDirectXFileData_GetName(lpdxfd, NULL, &length); ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); ok(length == 0, "Returned length should be 0 instead of %u\n", length); + length = 0; + name[0] = 0x7f; + hr = IDirectXFileData_GetName(lpdxfd, name, &length); + ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); + ok(length == 0, "Returned length should be 0 instead of %u\n", length); + ok(name[0] == 0x7f, "First character is %#x instead of 0x7f\n", name[0]); length = sizeof(name); + name[0] = 0x7f; hr = IDirectXFileData_GetName(lpdxfd, name, &length); ok(hr == DXFILE_OK, "IDirectXFileData_GetName: %x\n", hr); ok(length == 0, "Returned length should be 0 instead of %u\n", length); + ok(name[0] == 0, "First character is %#x instead of 0x00\n", name[0]); ref = IDirectXFileEnumObject_Release(lpdxfeo); ok(ref == 0, "Got refcount %d, expected 0\n", ref);

1 0

Christian Costa : d3dx9_36: Fix ID3DXFileDataImpl_GetName + add some tests.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: 635f76b085c46f4056684fd185217c495ee432ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=635f76b085c46f4056684fd18… Author: Christian Costa <titan.costa(a)gmail.com> Date: Thu May 16 01:09:01 2013 +0200 d3dx9_36: Fix ID3DXFileDataImpl_GetName + add some tests. --- dlls/d3dx9_36/tests/xfile.c | 83 +++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/xfile.c | 15 +++++++- 2 files changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/tests/xfile.c b/dlls/d3dx9_36/tests/xfile.c index 49c96ea..4ac521b 100644 --- a/dlls/d3dx9_36/tests/xfile.c +++ b/dlls/d3dx9_36/tests/xfile.c @@ -55,6 +55,13 @@ static char objects[] = "1; 2; 3;\n" "}\n"; +static char object_noname[] = +"xof 0302txt 0064\n" +"Header\n" +"{\n" +"1; 2; 3;\n" +"}\n"; + static void test_templates(void) { ID3DXFile *d3dxfile; @@ -128,6 +135,81 @@ static void test_lock_unlock(void) d3dxfile->lpVtbl->Release(d3dxfile); } +static void test_getname(void) +{ + ID3DXFile *d3dxfile; + D3DXF_FILELOADMEMORY memory; + ID3DXFileEnumObject *enum_object; + ID3DXFileData *data_object; + SIZE_T length; + char name[100]; + HRESULT ret; + + ret = D3DXFileCreate(&d3dxfile); + ok(ret == S_OK, "D3DXCreateFile failed with %#x\n", ret); + + ret = d3dxfile->lpVtbl->RegisterTemplates(d3dxfile, templates, sizeof(templates) - 1); + ok(ret == S_OK, "RegisterTemplates failed with %#x\n", ret); + + /* Check object with name */ + memory.lpMemory = objects; + memory.dSize = sizeof(objects) - 1; + ret = d3dxfile->lpVtbl->CreateEnumObject(d3dxfile, &memory, D3DXF_FILELOAD_FROMMEMORY, &enum_object); + ok(ret == S_OK, "CreateEnumObject failed with %#x\n", ret); + ret = enum_object->lpVtbl->GetChild(enum_object, 0, &data_object); + ok(ret == S_OK, "GetChild failed with %#x\n", ret); + + ret = data_object->lpVtbl->GetName(data_object, NULL, NULL); + ok(ret == D3DXFERR_BADVALUE, "GetName returned %#x, expected %#x\n", ret, D3DXFERR_BADVALUE); + ret = data_object->lpVtbl->GetName(data_object, name, NULL); + ok(ret == D3DXFERR_BADVALUE, "GetName returned %#x, expected %#x\n", ret, D3DXFERR_BADVALUE); + ret = data_object->lpVtbl->GetName(data_object, NULL, &length); + ok(ret == S_OK, "GetName failed with %#x\n", ret); + ok(length == 7, "Returned length should be 7 instead of %ld\n", length); + length = sizeof(name); + ret = data_object->lpVtbl->GetName(data_object, name, &length); + ok(ret == S_OK, "GetName failed with %#x\n", ret); + ok(length == 7, "Returned length should be 7 instead of %ld\n", length); + ok(!strcmp(name, "Object"), "Returned string should be 'Object' intead of '%s'\n", name); + length = 3; + ret = data_object->lpVtbl->GetName(data_object, name, &length); + ok(ret== D3DXFERR_BADVALUE, "GetName returned %#x, expected %#x\n", ret, D3DXFERR_BADVALUE); + + data_object->lpVtbl->Release(data_object); + enum_object->lpVtbl->Release(enum_object); + + /* Check object without name */ + memory.lpMemory = object_noname; + memory.dSize = sizeof(object_noname) - 1; + ret = d3dxfile->lpVtbl->CreateEnumObject(d3dxfile, &memory, D3DXF_FILELOAD_FROMMEMORY, &enum_object); + ok(ret == S_OK, "CreateEnumObject failed with %#x\n", ret); + ret = enum_object->lpVtbl->GetChild(enum_object, 0, &data_object); + ok(ret == S_OK, "GetChild failed with %#x\n", ret); + + /* Contrary to d3dxof, d3dx9_36 returns an empty string with a null byte when no name is available. + * If the input size is 0, it returns a length of 1 without touching the buffer */ + ret = data_object->lpVtbl->GetName(data_object, NULL, &length); + ok(ret == S_OK, "GetName failed with %#x\n", ret); + ok(length == 1, "Returned length should be 1 instead of %ld\n", length); + length = 0; + name[0] = 0x7f; + ret = data_object->lpVtbl->GetName(data_object, name, &length); + ok(ret == S_OK, "GetName failed with %#x\n", ret); + ok(length == 1, "Returned length should be 1 instead of %ld\n", length); + ok(name[0] == 0x7f, "First character is %#x instead of 0x7f\n", name[0]); + length = sizeof(name); + name[0] = 0x7f; + ret = data_object->lpVtbl->GetName(data_object, name, &length); + ok(ret == S_OK, "GetName failed with %#x\n", ret); + ok(length == 1, "Returned length should be 1 instead of %ld\n", length); + ok(name[0] == 0, "First character is %#x instead of 0x00\n", name[0]); + + data_object->lpVtbl->Release(data_object); + enum_object->lpVtbl->Release(enum_object); + d3dxfile->lpVtbl->Release(d3dxfile); + +} + static inline void debugstr_guid(char* buf, const GUID *id) { sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", @@ -278,5 +360,6 @@ START_TEST(xfile) { test_templates(); test_lock_unlock(); + test_getname(); test_dump(); } diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c index 81f9da3..9c57277 100644 --- a/dlls/d3dx9_36/xfile.c +++ b/dlls/d3dx9_36/xfile.c @@ -38,6 +38,8 @@ static HRESULT error_dxfile_to_d3dxfile(HRESULT error) return D3DXFERR_BADFILEFLOATSIZE; case DXFILEERR_PARSEERROR: return D3DXFERR_PARSEERROR; + case DXFILEERR_BADVALUE: + return D3DXFERR_BADVALUE; default: FIXME("Cannot map error %#x\n", error); return E_FAIL; @@ -151,8 +153,8 @@ static HRESULT WINAPI ID3DXFileDataImpl_GetName(ID3DXFileData *iface, char *name TRACE("(%p)->(%p, %p)\n", iface, name, size); - if (!name || !size) - return E_POINTER; + if (!size) + return D3DXFERR_BADVALUE; dxfile_size = *size; @@ -160,6 +162,15 @@ static HRESULT WINAPI ID3DXFileDataImpl_GetName(ID3DXFileData *iface, char *name if (ret != DXFILE_OK) return error_dxfile_to_d3dxfile(ret); + if (!dxfile_size) + { + /* Contrary to d3dxof, d3dx9_36 returns an empty string with a null byte when no name is available. + * If the input size is 0, it returns a length of 1 without touching the buffer */ + dxfile_size = 1; + if (name && *size) + name[0] = 0; + } + *size = dxfile_size; return S_OK;

1 0

Jacek Caban : vbscript: Round half to even in to_int.
by Alexandre Julliard 16 May '13

16 May '13

Module: wine Branch: master Commit: 48a862306288d69d3623d5ecdc0f5a5a40addafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a862306288d69d3623d5ecd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 16 11:26:17 2013 +0200 vbscript: Round half to even in to_int. Spotted by Zhan Jianyu. --- dlls/vbscript/global.c | 12 ++++++++++-- dlls/vbscript/tests/api.vbs | 9 +++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 4a5a277..392b88f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -150,12 +150,20 @@ static HRESULT to_int(VARIANT *v, int *ret) *ret = V_I4(v); break; case VT_R8: { - double n = round(V_R8(v)); + double n = floor(V_R8(v)+0.5); + INT32 i; + if(!is_int32(n)) { FIXME("%lf is out of int range\n", n); return E_FAIL; } - *ret = n; + + /* Round half to even */ + i = n; + if(i%2 && n-V_R8(v) == 0.5) + i--; + + *ret = i; break; } case VT_BOOL: diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 0aaeefb..b6d8cd5 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -134,6 +134,8 @@ Call ok(getVT(Chr(120)) = "VT_BSTR", "getVT(Chr(120)) = " & getVT(Chr(120))) Call ok(getVT(Chr(255)) = "VT_BSTR", "getVT(Chr(255)) = " & getVT(Chr(255))) Call ok(Chr(120) = "x", "Chr(120) = " & Chr(120)) Call ok(Chr(0) <> "", "Chr(0) = """"") +Call ok(Chr(120.5) = "x", "Chr(120.5) = " & Chr(120.5)) +Call ok(Chr(119.5) = "x", "Chr(119.5) = " & Chr(119.5)) Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?") Set x = new EmptyClass @@ -292,6 +294,9 @@ Call ok(Space(5) = " ", "Space(5) = " & Space(5) & """") Call ok(Space(5.2) = " ", "Space(5.2) = " & Space(5.2) & """") Call ok(Space(5.8) = " ", "Space(5.8) = " & Space(5.8) & """") Call ok(Space(5.5) = " ", "Space(5.5) = " & Space(5.5) & """") +Call ok(Space(4.5) = " ", "Space(4.5) = " & Space(4.5) & """") +Call ok(Space(0.5) = "", "Space(0.5) = " & Space(0.5) & """") +Call ok(Space(1.5) = " ", "Space(1.5) = " & Space(1.5) & """") Sub TestStrReverse(str, ex) Call ok(StrReverse(str) = ex, "StrReverse(" & str & ") = " & StrReverse(str)) @@ -310,6 +315,8 @@ TestLeft "test", 2, "te" TestLeft "test", 5, "test" TestLeft "test", 0, "" TestLeft 123, 2, "12" +TestLeft "123456", 1.5, "12" +TestLeft "123456", 2.5, "12" if isEnglishLang then TestLeft true, 2, "Tr" Sub TestRight(str, len, ex) @@ -383,6 +390,8 @@ if isEnglishLang then Call ok(WeekDayName(1, 10) = "Sun", "WeekDayName(1, 10) = " & WeekDayName(1, 10)) Call ok(WeekDayName(1, true, 0) = "Sun", "WeekDayName(1, true, 0) = " & WeekDayName(1, true, 0)) Call ok(WeekDayName(1, true, 2) = "Mon", "WeekDayName(1, true, 2) = " & WeekDayName(1, true, 2)) + Call ok(WeekDayName(1, true, 2.5) = "Mon", "WeekDayName(1, true, 2.5) = " & WeekDayName(1, true, 2.5)) + Call ok(WeekDayName(1, true, 1.5) = "Mon", "WeekDayName(1, true, 1.5) = " & WeekDayName(1, true, 1.5)) Call ok(WeekDayName(1, true, 7) = "Sat", "WeekDayName(1, true, 7) = " & WeekDayName(1, true, 7)) Call ok(WeekDayName(1, true, 7.1) = "Sat", "WeekDayName(1, true, 7.1) = " & WeekDayName(1, true, 7.1))

1 0

Aric Stewart : user32: Points for IMR_QUERYCHARPOSITION need to be in screen coordinates.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 7559526438736fe634dc07e6effd8d8d993cc1fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=7559526438736fe634dc07e6e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed May 15 12:40:43 2013 -0500 user32: Points for IMR_QUERYCHARPOSITION need to be in screen coordinates. Found by Ken Thomases. --- dlls/user32/edit.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 1ce79db..126ab12 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -5182,6 +5182,8 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B chpos->pt.y = HIWORD(pos); chpos->cLineHeight = es->line_height; chpos->rcDocument = es->format_rect; + MapWindowPoints(hwnd, 0, &chpos->pt, 1); + MapWindowPoints(hwnd, 0, (POINT*)&chpos->rcDocument, 2); result = 1; break; }

1 0

Piotr Caban : user32: Use SendNotifyMessage to send WM_DRAWCLIPBOARD.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: dd573925e5bbfad0a19470c0462d5f23bcbc201d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd573925e5bbfad0a19470c04… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed May 15 15:04:58 2013 +0200 user32: Use SendNotifyMessage to send WM_DRAWCLIPBOARD. --- dlls/user32/clipboard.c | 4 +- dlls/user32/tests/clipboard.c | 78 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index 0985e6f..e6fda2e 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -287,7 +287,7 @@ BOOL WINAPI CloseClipboard(void) bCBHasChanged = FALSE; if (hWndViewer) - SendMessageW(hWndViewer, WM_DRAWCLIPBOARD, (WPARAM) GetClipboardOwner(), 0); + SendNotifyMessageW(hWndViewer, WM_DRAWCLIPBOARD, (WPARAM) GetClipboardOwner(), 0); } bRet = TRUE; @@ -393,7 +393,7 @@ HWND WINAPI SetClipboardViewer( HWND hWnd ) HWND hwndPrev = CLIPBOARD_SetClipboardViewer(hWnd); if (hWnd) - SendMessageW(hWnd, WM_DRAWCLIPBOARD, (WPARAM) GetClipboardOwner(), 0); + SendNotifyMessageW(hWnd, WM_DRAWCLIPBOARD, (WPARAM) GetClipboardOwner(), 0); TRACE("(%p): returning %p\n", hWnd, hwndPrev); return hwndPrev; diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 655d158..e2e727c 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -269,6 +269,83 @@ static void test_synthesized(void) ok(r, "gle %d\n", GetLastError()); } +static CRITICAL_SECTION clipboard_cs; +static LRESULT CALLBACK clipboard_wnd_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + switch(msg) { + case WM_DRAWCLIPBOARD: + EnterCriticalSection(&clipboard_cs); + LeaveCriticalSection(&clipboard_cs); + break; + case WM_USER: + PostQuitMessage(0); + break; + } + + return DefWindowProc(hwnd, msg, wp, lp); +} + +static DWORD WINAPI clipboard_thread(void *param) +{ + HWND win = param; + BOOL r; + + EnterCriticalSection(&clipboard_cs); + SetLastError(0xdeadbeef); + SetClipboardViewer(win); + ok(GetLastError() == 0xdeadbeef, "GetLastError = %d\n", GetLastError()); + LeaveCriticalSection(&clipboard_cs); + + r = OpenClipboard(win); + ok(r, "OpenClipboard failed: %d\n", GetLastError()); + + r = EmptyClipboard(); + ok(r, "EmptyClipboard failed: %d\n", GetLastError()); + + EnterCriticalSection(&clipboard_cs); + r = CloseClipboard(); + ok(r, "CloseClipboard failed: %d\n", GetLastError()); + LeaveCriticalSection(&clipboard_cs); + + r = PostMessage(win, WM_USER, 0, 0); + ok(r, "PostMessage failed: %d\n", GetLastError()); + return 0; +} + +static void test_messages(void) +{ + WNDCLASS cls; + HWND win; + MSG msg; + HANDLE thread; + DWORD tid; + + InitializeCriticalSection(&clipboard_cs); + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = clipboard_wnd_proc; + cls.hInstance = GetModuleHandle(0); + cls.lpszClassName = "clipboard_test"; + RegisterClass(&cls); + + win = CreateWindow("clipboard_test", NULL, 0, 0, 0, 0, 0, NULL, 0, NULL, 0); + ok(win != NULL, "CreateWindow failed: %d\n", GetLastError()); + + thread = CreateThread(NULL, 0, clipboard_thread, (void*)win, 0, &tid); + ok(thread != NULL, "CreateThread failed: %d\n", GetLastError()); + + while(GetMessage(&msg, NULL, 0, 0)) { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + ok(WaitForSingleObject(thread, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + CloseHandle(thread); + + UnregisterClass("clipboard_test", GetModuleHandle(0)); + DeleteCriticalSection(&clipboard_cs); +} + START_TEST(clipboard) { SetLastError(0xdeadbeef); @@ -278,4 +355,5 @@ START_TEST(clipboard) test_RegisterClipboardFormatA(); test_ClipboardOwner(); test_synthesized(); + test_messages(); }

1 0

Jacek Caban : mshtml: Keep reference to document node in onload event handler.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 503032749b0b9091dfbde69385888bc39d733672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=503032749b0b9091dfbde6938… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 15 12:52:52 2013 +0200 mshtml: Keep reference to document node in onload event handler. --- dlls/mshtml/nsevents.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 297ef8c..fc6504b 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -235,6 +235,7 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event HTMLDocumentNode *doc = This->This->doc; nsIDOMHTMLElement *nsbody = NULL; HTMLDocumentObj *doc_obj = NULL; + nsresult nsres = NS_OK; TRACE("(%p)\n", doc); @@ -245,6 +246,8 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event connect_scripts(doc->window); + htmldoc_addref(&doc->basedoc); + if(doc_obj) handle_docobj_load(doc_obj); @@ -264,18 +267,19 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event IDocObjectService_FireDocumentComplete(doc_obj->doc_object_service, &doc->basedoc.window->base.IHTMLWindow2_iface, 0); - if(!doc->nsdoc) { + if(doc->nsdoc) { + nsIDOMHTMLDocument_GetBody(doc->nsdoc, &nsbody); + if(nsbody) { + fire_event(doc, EVENTID_LOAD, TRUE, (nsIDOMNode*)nsbody, event, (IDispatch*)&doc->window->base.IDispatchEx_iface); + nsIDOMHTMLElement_Release(nsbody); + } + }else { ERR("NULL nsdoc\n"); - return NS_ERROR_FAILURE; + nsres = NS_ERROR_FAILURE; } - nsIDOMHTMLDocument_GetBody(doc->nsdoc, &nsbody); - if(nsbody) { - fire_event(doc, EVENTID_LOAD, TRUE, (nsIDOMNode*)nsbody, event, (IDispatch*)&doc->window->base.IDispatchEx_iface); - nsIDOMHTMLElement_Release(nsbody); - } - - return NS_OK; + htmldoc_release(&doc->basedoc); + return nsres; } static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *event)

1 0

Jacek Caban : ieframe: Keep reference to ShellObject while calling DocumentComplete event.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 3a1ce6a864acfe3e0143b1c1bea663be15d6ddeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a1ce6a864acfe3e0143b1c1b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 15 12:52:41 2013 +0200 ieframe: Keep reference to ShellObject while calling DocumentComplete event. --- dlls/ieframe/shellbrowser.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/shellbrowser.c b/dlls/ieframe/shellbrowser.c index 944c7bc..55763db 100644 --- a/dlls/ieframe/shellbrowser.c +++ b/dlls/ieframe/shellbrowser.c @@ -824,12 +824,18 @@ static HRESULT WINAPI DocObjectService_FireDocumentComplete( V_VT(&url_var) = VT_BSTR; V_BSTR(&url_var) = url; + /* Keep reference to This. It may be released in event handler. */ + IShellBrowser_AddRef(&This->IShellBrowser_iface); + TRACE(">>>\n"); call_sink(This->doc_host->cps.wbe2, DISPID_DOCUMENTCOMPLETE, &dp); TRACE("<<<\n"); SysFreeString(url); - This->doc_host->busy = VARIANT_FALSE; + if(This->doc_host) + This->doc_host->busy = VARIANT_FALSE; + + IShellBrowser_Release(&This->IShellBrowser_iface); return S_OK; }

1 0

Stefan Dösinger : wined3d: Don' t pass the device to atifs_free_ffpshader.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 6621b11ad1e92660c3ca757d951b6b7497463084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6621b11ad1e92660c3ca757d9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 14 23:46:02 2013 +0200 wined3d: Don't pass the device to atifs_free_ffpshader. --- dlls/wined3d/ati_fragment_shader.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index d219111..980f657 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1167,10 +1167,9 @@ static void *atifs_alloc(const struct wined3d_shader_backend_ops *shader_backend } /* Context activation is done by the caller. */ -static void atifs_free_ffpshader(struct wine_rb_entry *entry, void *context) +static void atifs_free_ffpshader(struct wine_rb_entry *entry, void *cb_ctx) { - struct wined3d_device *device = context; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info = cb_ctx; struct atifs_ffp_desc *entry_ati = WINE_RB_ENTRY_VALUE(entry, struct atifs_ffp_desc, parent.entry); GL_EXTCALL(glDeleteFragmentShaderATI(entry_ati->shader)); @@ -1183,7 +1182,7 @@ static void atifs_free(struct wined3d_device *device) { struct atifs_private_data *priv = device->fragment_priv; - wine_rb_destroy(&priv->fragment_shaders, atifs_free_ffpshader, device); + wine_rb_destroy(&priv->fragment_shaders, atifs_free_ffpshader, &device->adapter->gl_info); HeapFree(GetProcessHeap(), 0, priv); device->fragment_priv = NULL;

1 0

Stefan Dösinger : wined3d: Initialize the gl_info pointer from the context.
by Alexandre Julliard 15 May '13

15 May '13

Module: wine Branch: master Commit: 121bd9d20108178fb14d1f335c95eb6ddb917edf URL: http://source.winehq.org/git/wine.git/?a=commit;h=121bd9d20108178fb14d1f335… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 14 23:46:01 2013 +0200 wined3d: Initialize the gl_info pointer from the context. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6a901e3..405a123 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7042,7 +7042,7 @@ static void upload_palette(const struct wined3d_surface *surface, struct wined3d { BYTE table[256][4]; struct wined3d_device *device = surface->resource.device; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; + const struct wined3d_gl_info *gl_info = context->gl_info; struct arbfp_blit_priv *priv = device->blit_priv; BOOL colorkey = (surface->CKeyFlags & WINEDDSD_CKSRCBLT) != 0;

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
50
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 May 2013