August 2011 - Wine-commits - list.winehq.org

Francois Gouget : dinput: Make _dump_diactionformatA() static.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 19edb436278a6949a257db6197f5d4e6365f5386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19edb436278a6949a257db619… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 3 11:36:55 2011 +0200 dinput: Make _dump_diactionformatA() static. --- dlls/dinput/dinput_main.c | 2 +- dlls/dinput/dinput_private.h | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c461c07..6ddcd71 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -233,7 +233,7 @@ static void _dump_EnumDevices_dwFlags(DWORD dwFlags) { TRACE("\n"); } -void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) { +static void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) { unsigned int i; FIXME("diaf.dwSize = %d\n", lpdiActionFormat->dwSize); diff --git a/dlls/dinput/dinput_private.h b/dlls/dinput/dinput_private.h index 3c4776e..94b16a5 100644 --- a/dlls/dinput/dinput_private.h +++ b/dlls/dinput/dinput_private.h @@ -63,7 +63,6 @@ extern const struct dinput_device joystick_osx_device DECLSPEC_HIDDEN; extern void check_dinput_hooks(LPDIRECTINPUTDEVICE8W) DECLSPEC_HIDDEN; typedef int (*DI_EVENT_PROC)(LPDIRECTINPUTDEVICE8A, WPARAM, LPARAM); -extern void _dump_diactionformatA(LPDIACTIONFORMATA) DECLSPEC_HIDDEN; extern void _copy_diactionformatAtoW(LPDIACTIONFORMATW, LPDIACTIONFORMATA) DECLSPEC_HIDDEN; extern void _copy_diactionformatWtoA(LPDIACTIONFORMATA, LPDIACTIONFORMATW) DECLSPEC_HIDDEN;

1 0

Francois Gouget : d3dxof: Fix the spelling of the children structure fields and constants.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 8ca8267caba2d31149d89286515ed66c301d0853 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca8267caba2d31149d892865… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 3 11:39:17 2011 +0200 d3dxof: Fix the spelling of the children structure fields and constants. --- dlls/d3dxof/d3dxof.c | 10 +++++----- dlls/d3dxof/d3dxof_private.h | 10 +++++----- dlls/d3dxof/parsing.c | 30 +++++++++++++++--------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index b353020..b8f0f00 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -615,7 +615,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface TRACE("(%p/%p)->(%p)\n", This, iface, ppChildObj); - if (This->cur_enum_object >= This->pobj->nb_childs) + if (This->cur_enum_object >= This->pobj->nb_children) return DXFILEERR_NOMOREOBJECTS; if (This->from_ref && (This->level >= 1)) @@ -624,7 +624,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface return DXFILEERR_NOMOREOBJECTS; } - if (This->pobj->childs[This->cur_enum_object]->binary) + if (This->pobj->children[This->cur_enum_object]->binary) { IDirectXFileBinaryImpl *object; @@ -634,7 +634,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface *ppChildObj = (LPDIRECTXFILEOBJECT)&object->IDirectXFileBinary_iface; } - else if (This->pobj->childs[This->cur_enum_object]->ptarget) + else if (This->pobj->children[This->cur_enum_object]->ptarget) { IDirectXFileDataReferenceImpl *object; @@ -642,7 +642,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface if (FAILED(hr)) return hr; - object->ptarget = This->pobj->childs[This->cur_enum_object++]->ptarget; + object->ptarget = This->pobj->children[This->cur_enum_object++]->ptarget; *ppChildObj = (LPDIRECTXFILEOBJECT)&object->IDirectXFileDataReference_iface; } @@ -654,7 +654,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetNextObject(IDirectXFileData* iface if (FAILED(hr)) return hr; - object->pobj = This->pobj->childs[This->cur_enum_object++]; + object->pobj = This->pobj->children[This->cur_enum_object++]; object->cur_enum_object = 0; object->from_ref = This->from_ref; object->level = This->level + 1; diff --git a/dlls/d3dxof/d3dxof_private.h b/dlls/d3dxof/d3dxof_private.h index 186e707..ac9bb8b 100644 --- a/dlls/d3dxof/d3dxof_private.h +++ b/dlls/d3dxof/d3dxof_private.h @@ -36,7 +36,7 @@ #define MAX_NAME_LEN 32 #define MAX_ARRAY_DIM 4 #define MAX_MEMBERS 50 -#define MAX_CHILDS 100 +#define MAX_CHILDREN 100 #define MAX_TEMPLATES 200 #define MAX_OBJECTS 500 #define MAX_SUBOBJECTS 2000 @@ -56,8 +56,8 @@ typedef struct { GUID class_id; BOOL open; BOOL binary; - ULONG nb_childs; - char childs[MAX_CHILDS][MAX_NAME_LEN]; + ULONG nb_children; + char children[MAX_CHILDREN][MAX_NAME_LEN]; ULONG nb_members; member members[MAX_MEMBERS]; } xtemplate; @@ -79,9 +79,9 @@ struct _xobject { DWORD size; ULONG nb_members; xobject_member members[MAX_MEMBERS]; - ULONG nb_childs; + ULONG nb_children; ULONG nb_subobjects; - struct _xobject * childs[MAX_CHILDS]; + struct _xobject * children[MAX_CHILDREN]; struct _xobject * root; }; diff --git a/dlls/d3dxof/parsing.c b/dlls/d3dxof/parsing.c index 1167456..21a199a 100644 --- a/dlls/d3dxof/parsing.c +++ b/dlls/d3dxof/parsing.c @@ -156,11 +156,11 @@ static void dump_template(xtemplate* templates_array, xtemplate* ptemplate) } if (ptemplate->open) DPRINTF("[...]\n"); - else if (ptemplate->nb_childs) + else if (ptemplate->nb_children) { - DPRINTF("[%s", ptemplate->childs[0]); - for (j = 1; j < ptemplate->nb_childs; j++) - DPRINTF(",%s", ptemplate->childs[j]); + DPRINTF("[%s", ptemplate->children[0]); + for (j = 1; j < ptemplate->nb_children; j++) + DPRINTF(",%s", ptemplate->children[j]); DPRINTF("]\n"); } DPRINTF("}\n"); @@ -909,10 +909,10 @@ static BOOL parse_template_option_info(parse_buffer * buf) { if (get_TOKEN(buf) != TOKEN_NAME) return FALSE; - strcpy(cur_template->childs[cur_template->nb_childs], (char*)buf->value); + strcpy(cur_template->children[cur_template->nb_children], (char*)buf->value); if (check_TOKEN(buf) == TOKEN_GUID) get_TOKEN(buf); - cur_template->nb_childs++; + cur_template->nb_children++; if (check_TOKEN(buf) != TOKEN_COMMA) break; get_TOKEN(buf); @@ -1305,7 +1305,7 @@ static BOOL parse_object_members_list(parse_buffer * buf) static BOOL parse_object_parts(parse_buffer * buf, BOOL allow_optional) { - buf->pxo->nb_childs = 0; + buf->pxo->nb_children = 0; if (!parse_object_members_list(buf)) return FALSE; @@ -1350,10 +1350,10 @@ _exit: return FALSE; } - buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; - buf->pxo->childs[buf->pxo->nb_childs]->ptarget = &(buf->pxo_globals[i])[j]; - buf->pxo->childs[buf->pxo->nb_childs]->binary = FALSE; - buf->pxo->nb_childs++; + buf->pxo->children[buf->pxo->nb_children] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; + buf->pxo->children[buf->pxo->nb_children]->ptarget = &(buf->pxo_globals[i])[j]; + buf->pxo->children[buf->pxo->nb_children]->binary = FALSE; + buf->pxo->nb_children++; } else if (check_TOKEN(buf) == TOKEN_NAME) { @@ -1365,7 +1365,7 @@ _exit: return FALSE; } - buf->pxo = buf->pxo->childs[buf->pxo->nb_childs] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; + buf->pxo = buf->pxo->children[buf->pxo->nb_children] = &buf->pxo_tab[buf->pxo->root->nb_subobjects++]; TRACE("Enter optional %s\n", (char*)buf->value); buf->level++; @@ -1376,16 +1376,16 @@ _exit: } buf->level--; buf->pxo = pxo; - buf->pxo->nb_childs++; + buf->pxo->nb_children++; } else break; } } - if (buf->pxo->nb_childs > MAX_CHILDS) + if (buf->pxo->nb_children > MAX_CHILDREN) { - FIXME("Too many children %d\n", buf->pxo->nb_childs); + FIXME("Too many children %d\n", buf->pxo->nb_children); return FALSE; }

1 0

Francois Gouget : ntdll: Fix the field names of KUSER_SHARED_DATA and update it.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 21d6086c60bccdb1614e992837e2b3b7c031f6e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d6086c60bccdb1614e99283… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 3 11:51:39 2011 +0200 ntdll: Fix the field names of KUSER_SHARED_DATA and update it. --- dlls/ntdll/version.c | 5 ++--- include/ddk/wdm.h | 24 ++++++++++++++++++------ 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/version.c b/dlls/ntdll/version.c index bcb92a9..74010dd 100644 --- a/dlls/ntdll/version.c +++ b/dlls/ntdll/version.c @@ -531,9 +531,8 @@ done: user_shared_data->NtProductType = current_version->wProductType; user_shared_data->ProductTypeIsValid = TRUE; - user_shared_data->MajorNtVersion = current_version->dwMajorVersion; - user_shared_data->MinorNtVersion = current_version->dwMinorVersion; - user_shared_data->MinorNtVersion = current_version->dwMinorVersion; + user_shared_data->NtMajorVersion = current_version->dwMajorVersion; + user_shared_data->NtMinorVersion = current_version->dwMinorVersion; user_shared_data->SuiteMask = current_version->wSuiteMask; TRACE( "got %d.%d platform %d build %x name %s service pack %d.%d product %d\n", diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 2f3fccb..8f5aa04 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -994,6 +994,13 @@ typedef enum _ALTERNATIVE_ARCHITECTURE_TYPE EndAlternatives } ALTERNATIVE_ARCHITECTURE_TYPE; +#define NX_SUPPORT_POLICY_ALWAYSOFF 0 +#define NX_SUPPORT_POLICY_ALWAYSON 1 +#define NX_SUPPORT_POLICY_OPTIN 2 +#define NX_SUPPORT_POLICY_OPTOUT 3 + +#define MAX_WOW64_SHARED_ENTRIES 16 + typedef struct _KUSER_SHARED_DATA { ULONG TickCountLowDeprecated; ULONG TickCountMultiplier; @@ -1003,15 +1010,15 @@ typedef struct _KUSER_SHARED_DATA { USHORT ImageNumberLow; USHORT ImageNumberHigh; WCHAR NtSystemRoot[260]; - ULONG MaxStckTraceDepth; + ULONG MaxStackTraceDepth; ULONG CryptoExponent; ULONG TimeZoneId; ULONG LargePageMinimum; - ULONG Reserverd2[7]; + ULONG Reserved2[7]; NT_PRODUCT_TYPE NtProductType; BOOLEAN ProductTypeIsValid; - ULONG MajorNtVersion; - ULONG MinorNtVersion; + ULONG NtMajorVersion; + ULONG NtMinorVersion; BOOLEAN ProcessorFeatures[PROCESSOR_FEATURE_MAX]; ULONG Reserved1; ULONG Reserved3; @@ -1020,6 +1027,7 @@ typedef struct _KUSER_SHARED_DATA { LARGE_INTEGER SystemExpirationDate; ULONG SuiteMask; BOOLEAN KdDebuggerEnabled; + UCHAR NXSupportPolicy; volatile ULONG ActiveConsoleId; volatile ULONG DismountCount; ULONG ComPlusPackage; @@ -1027,12 +1035,16 @@ typedef struct _KUSER_SHARED_DATA { ULONG NumberOfPhysicalPages; BOOLEAN SafeBootMode; ULONG TraceLogging; - ULONGLONG Fill0; - ULONGLONG SystemCall[4]; + ULONGLONG TestRetInstruction; + ULONG SystemCall; + ULONG SystemCallReturn; + ULONGLONG SystemCallPad[3]; union { volatile KSYSTEM_TIME TickCount; volatile ULONG64 TickCountQuad; } DUMMYUNIONNAME; + ULONG Cookie; + ULONG Wow64SharedInformation[MAX_WOW64_SHARED_ENTRIES]; } KSHARED_USER_DATA, *PKSHARED_USER_DATA; typedef enum _MEMORY_CACHING_TYPE {

1 0

Michael Stefaniuc : dpnet: COM cleanup for the IDirectPlay8Client iface.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: c97a2ecdcd68175eaa099e31d36a6ea33ea42b19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c97a2ecdcd68175eaa099e31d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 3 12:07:37 2011 +0200 dpnet: COM cleanup for the IDirectPlay8Client iface. --- dlls/dpnet/client.c | 186 ++++++++++++++++++++++++------------------- dlls/dpnet/dpnet_private.h | 5 +- 2 files changed, 106 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c97a2ecdcd68175eaa099…

1 0

Michael Stefaniuc : ole32/tests: COM cleanup in compobj.c.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 3673f6b7c4651247e206e5cb9c852d974c8adc43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3673f6b7c4651247e206e5cb9… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 3 12:13:03 2011 +0200 ole32/tests: COM cleanup in compobj.c. --- dlls/ole32/tests/compobj.c | 47 +++++++++++++++++++++++++------------------ 1 files changed, 27 insertions(+), 20 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 53a838e..b76c9d2 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -115,7 +115,7 @@ static ULONG WINAPI Test_IClassFactory_Release(LPCLASSFACTORY iface) static HRESULT WINAPI Test_IClassFactory_CreateInstance( LPCLASSFACTORY iface, - LPUNKNOWN pUnkOuter, + IUnknown *pUnkOuter, REFIID riid, LPVOID *ppvObj) { @@ -570,7 +570,7 @@ static void test_CoRegisterMessageFilter(void) } static HRESULT WINAPI Test_IUnknown_QueryInterface( - LPUNKNOWN iface, + IUnknown *iface, REFIID riid, LPVOID *ppvObj) { @@ -588,12 +588,12 @@ static HRESULT WINAPI Test_IUnknown_QueryInterface( return E_NOINTERFACE; } -static ULONG WINAPI Test_IUnknown_AddRef(LPUNKNOWN iface) +static ULONG WINAPI Test_IUnknown_AddRef(IUnknown *iface) { return 2; /* non-heap-based object */ } -static ULONG WINAPI Test_IUnknown_Release(LPUNKNOWN iface) +static ULONG WINAPI Test_IUnknown_Release(IUnknown *iface) { return 1; /* non-heap-based object */ } @@ -1271,10 +1271,15 @@ static void test_CoGetObjectContext(void) } typedef struct { - const IUnknownVtbl *lpVtbl; + IUnknown IUnknown_iface; LONG refs; } Test_CallContext; +static inline Test_CallContext *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, Test_CallContext, IUnknown_iface); +} + static HRESULT WINAPI Test_CallContext_QueryInterface( IUnknown *iface, REFIID riid, @@ -1295,13 +1300,13 @@ static HRESULT WINAPI Test_CallContext_QueryInterface( static ULONG WINAPI Test_CallContext_AddRef(IUnknown *iface) { - Test_CallContext *This = (Test_CallContext*)iface; + Test_CallContext *This = impl_from_IUnknown(iface); return InterlockedIncrement(&This->refs); } static ULONG WINAPI Test_CallContext_Release(IUnknown *iface) { - Test_CallContext *This = (Test_CallContext*)iface; + Test_CallContext *This = impl_from_IUnknown(iface); ULONG refs = InterlockedDecrement(&This->refs); if (!refs) HeapFree(GetProcessHeap(), 0, This); @@ -1320,7 +1325,7 @@ static void test_CoGetCallContext(void) HRESULT hr; ULONG refs; IUnknown *pUnk; - IUnknown *test_object; + Test_CallContext *test_object; if (!pCoSwitchCallContext) { @@ -1331,41 +1336,43 @@ static void test_CoGetCallContext(void) CoInitialize(NULL); test_object = HeapAlloc(GetProcessHeap(), 0, sizeof(Test_CallContext)); - ((Test_CallContext*)test_object)->lpVtbl = &TestCallContext_Vtbl; - ((Test_CallContext*)test_object)->refs = 1; + test_object->IUnknown_iface.lpVtbl = &TestCallContext_Vtbl; + test_object->refs = 1; hr = CoGetCallContext(&IID_IUnknown, (void**)&pUnk); ok(hr == RPC_E_CALL_COMPLETE, "Expected RPC_E_CALL_COMPLETE, got 0x%08x\n", hr); pUnk = (IUnknown*)0xdeadbeef; - hr = pCoSwitchCallContext(test_object, &pUnk); + hr = pCoSwitchCallContext(&test_object->IUnknown_iface, &pUnk); ok_ole_success(hr, "CoSwitchCallContext"); ok(pUnk == NULL, "expected NULL, got %p\n", pUnk); - refs = IUnknown_AddRef(test_object); + refs = IUnknown_AddRef(&test_object->IUnknown_iface); ok(refs == 2, "Expected refcount 2, got %d\n", refs); - IUnknown_Release(test_object); + IUnknown_Release(&test_object->IUnknown_iface); pUnk = (IUnknown*)0xdeadbeef; hr = CoGetCallContext(&IID_IUnknown, (void**)&pUnk); ok_ole_success(hr, "CoGetCallContext"); - ok(pUnk == test_object, "expected %p, got %p\n", test_object, pUnk); - refs = IUnknown_AddRef(test_object); + ok(pUnk == &test_object->IUnknown_iface, "expected %p, got %p\n", + &test_object->IUnknown_iface, pUnk); + refs = IUnknown_AddRef(&test_object->IUnknown_iface); ok(refs == 3, "Expected refcount 3, got %d\n", refs); - IUnknown_Release(test_object); + IUnknown_Release(&test_object->IUnknown_iface); IUnknown_Release(pUnk); pUnk = (IUnknown*)0xdeadbeef; hr = pCoSwitchCallContext(NULL, &pUnk); ok_ole_success(hr, "CoSwitchCallContext"); - ok(pUnk == test_object, "expected %p, got %p\n", test_object, pUnk); - refs = IUnknown_AddRef(test_object); + ok(pUnk == &test_object->IUnknown_iface, "expected %p, got %p\n", + &test_object->IUnknown_iface, pUnk); + refs = IUnknown_AddRef(&test_object->IUnknown_iface); ok(refs == 2, "Expected refcount 2, got %d\n", refs); - IUnknown_Release(test_object); + IUnknown_Release(&test_object->IUnknown_iface); hr = CoGetCallContext(&IID_IUnknown, (void**)&pUnk); ok(hr == RPC_E_CALL_COMPLETE, "Expected RPC_E_CALL_COMPLETE, got 0x%08x\n", hr); - IUnknown_Release(test_object); + IUnknown_Release(&test_object->IUnknown_iface); CoUninitialize(); }

1 0

Jacek Caban : mshtml: Added IURi-based nsIURL::GetDirectory implementation.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: d1256404995385e1c788c0ae3d67bad8b152c0eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1256404995385e1c788c0ae3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:33:32 2011 +0200 mshtml: Added IURi-based nsIURL::GetDirectory implementation. --- dlls/mshtml/nsio.c | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 8829bf7..ef36afb 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -2320,14 +2320,35 @@ static nsresult NSAPI nsURL_SetRef(nsIURL *iface, const nsACString *aRef) static nsresult NSAPI nsURL_GetDirectory(nsIURL *iface, nsACString *aDirectory) { nsWineURI *This = impl_from_nsIURL(iface); + char *dir = NULL; + WCHAR *ptr; + BSTR path; + HRESULT hres; TRACE("(%p)->(%p)\n", This, aDirectory); - if(This->nsurl) - return nsIURL_GetDirectory(This->nsurl, aDirectory); + if(!ensure_uri(This)) + return NS_ERROR_UNEXPECTED; - FIXME("default action not implemented\n"); - return NS_ERROR_NOT_IMPLEMENTED; + hres = IUri_GetPath(This->uri, &path); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + ptr = strrchrW(path, '/'); + if(ptr) { + if(ptr[1]) + *ptr = 0; + dir = heap_strdupWtoA(path); + if(!dir) { + SysFreeString(path); + return NS_ERROR_OUT_OF_MEMORY; + } + } + + SysFreeString(path); + TRACE("ret %s\n", debugstr_a(dir)); + nsACString_SetData(aDirectory, dir ? dir : ""); + return NS_OK; } static nsresult NSAPI nsURL_SetDirectory(nsIURL *iface, const nsACString *aDirectory)

1 0

Jacek Caban : mshtml: Call default event handlers only for events that have them.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 7a0600dc39e00e1232520d107d8efba781dbcda2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0600dc39e00e1232520d107… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:34:01 2011 +0200 mshtml: Call default event handlers only for events that have them. --- dlls/mshtml/htmlevent.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 9ab07a4..80d3d12 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -141,7 +141,7 @@ typedef struct { #define EVENT_FORWARDBODY 0x0004 #define EVENT_NODEHANDLER 0x0008 #define EVENT_CANCELABLE 0x0010 -#define EVENT_SETONINIT 0x0020 +#define EVENT_HASDEFAULTHANDLERS 0x0020 static const event_info_t event_info[] = { {beforeunloadW, onbeforeunloadW, EVENTT_NONE, DISPID_EVMETH_ONBEFOREUNLOAD, @@ -151,7 +151,7 @@ static const event_info_t event_info[] = { {changeW, onchangeW, EVENTT_HTML, DISPID_EVMETH_ONCHANGE, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {clickW, onclickW, EVENTT_MOUSE, DISPID_EVMETH_ONCLICK, - EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE|EVENT_SETONINIT}, + EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE|EVENT_HASDEFAULTHANDLERS}, {contextmenuW, oncontextmenuW, EVENTT_MOUSE, DISPID_EVMETH_ONCONTEXTMENU, EVENT_BUBBLE|EVENT_CANCELABLE}, {dblclickW, ondblclickW, EVENTT_MOUSE, DISPID_EVMETH_ONDBLCLICK, @@ -1062,7 +1062,7 @@ void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode if(event_obj) IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); - if(!prevent_default) { + if(!prevent_default && (event_info[eid].flags & EVENT_HASDEFAULTHANDLERS)) { nsIDOMNode_AddRef(target); nsnode = target; @@ -1382,7 +1382,7 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) init_nsevents(doc); for(i=0; i < EVENTID_LAST; i++) { - if(event_info[i].flags & EVENT_SETONINIT) { + if(event_info[i].flags & EVENT_HASDEFAULTHANDLERS) { hres = ensure_nsevent_handler(doc, NULL, NULL, i); if(FAILED(hres)) return hres;

1 0

Jacek Caban : mshtml: Allow async tasks to have custom destructors.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 7247eaa181eb05e423cdac6944bd62afeb6b91c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7247eaa181eb05e423cdac694… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 3 12:34:34 2011 +0200 mshtml: Allow async tasks to have custom destructors. --- dlls/mshtml/htmlwindow.c | 4 ++-- dlls/mshtml/mshtml_private.h | 3 ++- dlls/mshtml/navigate.c | 4 ++-- dlls/mshtml/nsio.c | 2 +- dlls/mshtml/persist.c | 4 ++-- dlls/mshtml/task.c | 10 ++++++++-- 6 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 465db09..61d0837 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -1847,7 +1847,7 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, task->window = This; task->bscallback = bsc; task->mon = mon; - push_task(&task->header, navigate_proc, This->task_magic); + push_task(&task->header, navigate_proc, NULL, This->task_magic); /* Silently and repeated when real loading starts? */ This->readystate = READYSTATE_LOADING; @@ -1866,7 +1866,7 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface, IHTMLWindow2_AddRef(&This->IHTMLWindow2_iface); task->window = This; task->uri = uri; - push_task(&task->header, navigate_javascript_proc, This->task_magic); + push_task(&task->header, navigate_javascript_proc, NULL, This->task_magic); /* Why silently? */ This->readystate = READYSTATE_COMPLETE; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 66f89c9..cc92d2f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -817,6 +817,7 @@ typedef void (*task_proc_t)(task_t*); struct task_t { LONG target_magic; task_proc_t proc; + task_proc_t destr; struct task_t *next; }; @@ -836,7 +837,7 @@ thread_data_t *get_thread_data(BOOL) DECLSPEC_HIDDEN; HWND get_thread_hwnd(void) DECLSPEC_HIDDEN; LONG get_task_target_magic(void) DECLSPEC_HIDDEN; -void push_task(task_t*,task_proc_t,LONG) DECLSPEC_HIDDEN; +void push_task(task_t*,task_proc_t,task_proc_t,LONG) DECLSPEC_HIDDEN; void remove_target_tasks(LONG) DECLSPEC_HIDDEN; DWORD set_task_timer(HTMLDocument*,DWORD,BOOL,IDispatch*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index 7c38935..ee6fd93 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1242,7 +1242,7 @@ static HRESULT async_stop_request(nsChannelBSC *This) IBindStatusCallback_AddRef(&This->bsc.IBindStatusCallback_iface); task->bsc = This; - push_task(&task->header, stop_request_proc, This->bsc.doc->basedoc.doc_obj->basedoc.task_magic); + push_task(&task->header, stop_request_proc, NULL, This->bsc.doc->basedoc.doc_obj->basedoc.task_magic); return S_OK; } @@ -1606,7 +1606,7 @@ HRESULT async_start_doc_binding(HTMLWindow *window, nsChannelBSC *bscallback) task->bscallback = bscallback; IBindStatusCallback_AddRef(&bscallback->bsc.IBindStatusCallback_iface); - push_task(&task->header, start_doc_binding_proc, window->task_magic); + push_task(&task->header, start_doc_binding_proc, NULL, window->task_magic); return S_OK; } diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index ef36afb..36ffcf8 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -925,7 +925,7 @@ static nsresult async_open(nsChannel *This, HTMLWindow *window, BOOL is_doc_chan task->doc = window->doc; task->bscallback = bscallback; - push_task(&task->header, start_binding_proc, window->doc->basedoc.task_magic); + push_task(&task->header, start_binding_proc, NULL, window->doc->basedoc.task_magic); } return NS_OK; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 550414f..a8f6834 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -296,14 +296,14 @@ HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, nsChannel task = heap_alloc(sizeof(docobj_task_t)); task->doc = This->doc_obj; - push_task(&task->header, set_progress_proc, This->doc_obj->basedoc.task_magic); + push_task(&task->header, set_progress_proc, NULL, This->doc_obj->basedoc.task_magic); } download_task = heap_alloc(sizeof(download_proc_task_t)); download_task->doc = This->doc_obj; download_task->set_download = set_download; download_task->url = url; - push_task(&download_task->header, set_downloading_proc, This->doc_obj->basedoc.task_magic); + push_task(&download_task->header, set_downloading_proc, NULL, This->doc_obj->basedoc.task_magic); return S_OK; } diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index c896179..136561c 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -47,12 +47,18 @@ typedef struct { struct list entry; } task_timer_t; -void push_task(task_t *task, task_proc_t proc, LONG magic) +static void default_task_destr(task_t *task) +{ + heap_free(task); +} + +void push_task(task_t *task, task_proc_t proc, task_proc_t destr, LONG magic) { thread_data_t *thread_data = get_thread_data(TRUE); task->target_magic = magic; task->proc = proc; + task->destr = destr ? destr : default_task_destr; task->next = NULL; if(thread_data->task_queue_tail) @@ -266,7 +272,7 @@ static LRESULT WINAPI hidden_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa break; task->proc(task); - heap_free(task); + task->destr(task); } return 0;

1 0

Octavian Voicu : configure: Disable gstreamer support if headers are not compatible with build environment .
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: b113af1b134554004761d38c40da27d657aa7275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b113af1b134554004761d38c4… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Wed Aug 3 01:38:43 2011 +0300 configure: Disable gstreamer support if headers are not compatible with build environment. --- configure | 25 +++++++++++++++++++++++-- configure.ac | 13 +++++++++---- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 3876127..7a27706 100755 --- a/configure +++ b/configure @@ -10527,7 +10527,23 @@ then if test "x$ac_cv_header_gst_gstpad_h" = xyes; then : ac_fn_c_check_header_mongrel "$LINENO" "gst/app/gstappsink.h" "ac_cv_header_gst_app_gstappsink_h" "$ac_includes_default" if test "x$ac_cv_header_gst_app_gstappsink_h" = xyes; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gst_pad_get_caps_reffed in -lgstreamer-0.10" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gint64 defined by gst/app/gstappsink.h is indeed 64-bit" >&5 +$as_echo_n "checking whether gint64 defined by gst/app/gstappsink.h is indeed 64-bit... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <gst/app/gstappsink.h> +int +main () +{ +int a[sizeof(gint64) > 4 ? 1 : -1] + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gst_pad_get_caps_reffed in -lgstreamer-0.10" >&5 $as_echo_n "checking for gst_pad_get_caps_reffed in -lgstreamer-0.10... " >&6; } if ${ac_cv_lib_gstreamer_0_10_gst_pad_get_caps_reffed+:} false; then : $as_echo_n "(cached) " >&6 @@ -10603,12 +10619,17 @@ $as_echo "$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" >&6; } if test "x$ac_cv_lib_gstapp_0_10_gst_app_buffer_new" = xyes; then : GSTREAMER_LIBS="$ac_gst_libs" - GSTREAMER_INCL="$ac_gst_incl" + GSTREAMER_INCL="$ac_gst_incl" fi fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi diff --git a/configure.ac b/configure.ac index ecd74d6..df7a355 100644 --- a/configure.ac +++ b/configure.ac @@ -1456,10 +1456,15 @@ then CPPFLAGS="$CPPFLAGS $ac_gst_incl" AC_CHECK_HEADER([gst/gstpad.h], [AC_CHECK_HEADER([gst/app/gstappsink.h], - [AC_CHECK_LIB(gstreamer-0.10,gst_pad_get_caps_reffed, - [AC_CHECK_LIB(gstapp-0.10,gst_app_buffer_new, - [AC_SUBST(GSTREAMER_LIBS,"$ac_gst_libs") - AC_SUBST(GSTREAMER_INCL,"$ac_gst_incl")],,[$ac_gst_libs])])])]) + [AC_MSG_CHECKING([whether gint64 defined by gst/app/gstappsink.h is indeed 64-bit]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <gst/app/gstappsink.h>]], + [[int a[sizeof(gint64) > 4 ? 1 : -1]]])], + [AC_MSG_RESULT([yes]) + AC_CHECK_LIB(gstreamer-0.10,gst_pad_get_caps_reffed, + [AC_CHECK_LIB(gstapp-0.10,gst_app_buffer_new, + [AC_SUBST(GSTREAMER_LIBS,"$ac_gst_libs") + AC_SUBST(GSTREAMER_INCL,"$ac_gst_incl")],,[$ac_gst_libs])])], + [AC_MSG_RESULT([no])])])]) fi CPPFLAGS="$ac_save_CPPFLAGS" fi

1 0

Alexandre Julliard : gdi32: Partial implementation of PutImage in the null driver for DDBs.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 76b5c1dcacffdf08c836537f266219cf2c8cdde2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76b5c1dcacffdf08c836537f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 3 10:37:45 2011 +0200 gdi32: Partial implementation of PutImage in the null driver for DDBs. --- dlls/gdi32/bitmap.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/driver.c | 7 ---- dlls/gdi32/gdi_private.h | 3 ++ 3 files changed, 78 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 93bfe77..bce5183 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -126,6 +126,81 @@ done: return ERROR_SUCCESS; } +DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, + const struct gdi_image_bits *bits, struct bitblt_coords *src, + struct bitblt_coords *dst, DWORD rop ) +{ + BITMAPOBJ *bmp; + + if (!hbitmap) return ERROR_SUCCESS; + if (!(bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP ))) return ERROR_INVALID_HANDLE; + + if (info->bmiHeader.biPlanes != 1) goto update_format; + if (info->bmiHeader.biBitCount != bmp->bitmap.bmBitsPixel) goto update_format; + /* FIXME: check color masks */ + + if (bits) + { + int i, width_bytes = get_dib_stride( info->bmiHeader.biWidth, info->bmiHeader.biBitCount ); + unsigned char *dst_bits, *src_bits; + + if ((src->width != dst->width) || (src->height != dst->height)) + { + GDI_ReleaseObj( hbitmap ); + return ERROR_TRANSFORM_NOT_SUPPORTED; + } + if (src->visrect.left > 0 || src->visrect.right < bmp->bitmap.bmWidth || + dst->visrect.left > 0 || dst->visrect.right < bmp->bitmap.bmWidth) + { + FIXME( "setting partial rows not supported\n" ); + GDI_ReleaseObj( hbitmap ); + return ERROR_NOT_SUPPORTED; + } + if (clip) + { + FIXME( "clip region not supported\n" ); + GDI_ReleaseObj( hbitmap ); + return ERROR_NOT_SUPPORTED; + } + + if (!bmp->bitmap.bmBits && + !(bmp->bitmap.bmBits = HeapAlloc( GetProcessHeap(), 0, + bmp->bitmap.bmHeight * bmp->bitmap.bmWidthBytes ))) + { + GDI_ReleaseObj( hbitmap ); + return ERROR_OUTOFMEMORY; + } + src_bits = bits->ptr; + if (info->bmiHeader.biHeight > 0) + { + src_bits += (info->bmiHeader.biHeight - 1 - src->visrect.top) * width_bytes; + width_bytes = -width_bytes; + } + else + src_bits += src->visrect.top * width_bytes; + + dst_bits = (unsigned char *)bmp->bitmap.bmBits + dst->visrect.top * bmp->bitmap.bmWidthBytes; + if (width_bytes != bmp->bitmap.bmWidthBytes) + { + for (i = 0; i < dst->visrect.bottom - dst->visrect.top; i++) + { + memcpy( dst_bits, src_bits, min( abs(width_bytes), bmp->bitmap.bmWidthBytes )); + src_bits += width_bytes; + dst_bits += bmp->bitmap.bmWidthBytes; + } + } + else memcpy( dst_bits, src_bits, width_bytes * (dst->visrect.bottom - dst->visrect.top) ); + } + GDI_ReleaseObj( hbitmap ); + return ERROR_SUCCESS; + +update_format: + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = bmp->bitmap.bmBitsPixel; + if (info->bmiHeader.biHeight > 0) info->bmiHeader.biHeight = -info->bmiHeader.biHeight; + return ERROR_BAD_FORMAT; +} + /****************************************************************************** * CreateBitmap [GDI32.@] diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index 290a30d..dc4a33b 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -421,13 +421,6 @@ static BOOL nulldrv_Polyline( PHYSDEV dev, const POINT *points, INT count ) return TRUE; } -static DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, - const struct gdi_image_bits *bits, struct bitblt_coords *src, - struct bitblt_coords *dst, DWORD rop ) -{ - return ERROR_SUCCESS; -} - static UINT nulldrv_RealizeDefaultPalette( PHYSDEV dev ) { return 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 4aeef70..ed5bb8a 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -493,6 +493,9 @@ extern BOOL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD count ) extern BOOL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; extern BOOL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) DECLSPEC_HIDDEN; extern BOOL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count ) DECLSPEC_HIDDEN; +extern DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, + const struct gdi_image_bits *bits, struct bitblt_coords *src, + struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL nulldrv_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; extern INT nulldrv_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN;

1 0