wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

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

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

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

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 : 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 : hlink: Fix the spelling of a parameter name.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 70c9510b459567851d449ca53d2768ca4aa60158 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c9510b459567851d449ca53… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 3 11:36:46 2011 +0200 hlink: Fix the spelling of a parameter name. --- dlls/hlink/browse_ctx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/browse_ctx.c b/dlls/hlink/browse_ctx.c index 2496f9a..f6735d8 100644 --- a/dlls/hlink/browse_ctx.c +++ b/dlls/hlink/browse_ctx.c @@ -271,7 +271,7 @@ static HRESULT WINAPI IHlinkBC_Clone( IHlinkBrowseContext* iface, } static HRESULT WINAPI IHlinkBC_Close(IHlinkBrowseContext* iface, - DWORD reserverd) + DWORD reserved) { FIXME("\n"); return E_NOTIMPL;

1 0

Francois Gouget : oleaut32: Fix the spelling of an internal structure field name.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: c21bfe4479eb25da29fec1b018c2391ede8e7beb URL: http://source.winehq.org/git/wine.git/?a=commit;h=c21bfe4479eb25da29fec1b01… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 3 11:36:33 2011 +0200 oleaut32: Fix the spelling of an internal structure field name. --- dlls/oleaut32/usrmarshal.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 97bfef7..c67f384 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -190,7 +190,7 @@ void WINAPI BSTR_UserFree(ULONG *pFlags, BSTR *pstr) typedef struct { DWORD clSize; - DWORD rpcReserverd; + DWORD rpcReserved; USHORT vt; USHORT wReserved1; USHORT wReserved2; @@ -459,7 +459,7 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, header = (variant_wire_t *)Buffer; header->clSize = 0; /* fixed up at the end */ - header->rpcReserverd = 0; + header->rpcReserved = 0; header->vt = pvar->n1.n2.vt; header->wReserved1 = pvar->n1.n2.wReserved1; header->wReserved2 = pvar->n1.n2.wReserved2;

1 0

Francois Gouget : Assorted spelling fixes.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: ed3c9a1ecae405f88dc6242f57d2d30581455eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3c9a1ecae405f88dc6242f5… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Aug 3 11:36:15 2011 +0200 Assorted spelling fixes. --- dlls/comdlg32/printdlg.c | 2 +- dlls/dinput/tests/joystick.c | 4 ++-- dlls/dinput8/tests/device.c | 2 +- dlls/msdaps/usrmarshal.c | 2 +- dlls/mshtml/nsio.c | 2 +- dlls/msxml3/tests/domdoc.c | 2 +- dlls/winealsa.drv/midi.c | 4 ++-- dlls/wineoss.drv/midi.c | 2 +- dlls/winex11.drv/dib_convert.c | 2 +- dlls/winex11.drv/dib_dst_swap.c | 2 +- dlls/winex11.drv/dib_src_swap.c | 2 +- programs/cmd/tests/test_builtins.cmd | 2 +- programs/wineconsole/winecon_private.h | 2 +- tools/winemaker | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 43967a9..b2d5331 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3363,7 +3363,7 @@ PRINTDLG_PagePaintProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) HDC hdc; HBRUSH hbrush, holdbrush; pagesetup_data *data; - int papersize=0, orientation=0; /* FIXME: set this values for user paint hook */ + int papersize=0, orientation=0; /* FIXME: set these values for the user paint hook */ double scalx, scaly; if (uMsg != WM_PAINT) diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index 194069d..0251f35 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -395,7 +395,7 @@ static BOOL CALLBACK EnumJoysticks( } /* Check effect status. - * State: initialy stopped + * State: initially stopped * start * State: started * unacquire, acquire, download @@ -435,7 +435,7 @@ static BOOL CALLBACK EnumJoysticks( ok(IsEqualGUID(&GUID_ConstantForce, &guid), "Wrong guid returned\n"); /* Check autocenter status - * State: initialy stopped + * State: initially stopped * enable * State: enabled * acquire diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 31e2e3f..30c702f 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -296,7 +296,7 @@ static void test_action_mapping(void) hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, enumeration_callback, &data, DIEDBSFL_ATTACHEDONLY); ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed: hr=%08x\n", hr); - /* After a succesfull action mapping we should have no devices available */ + /* After a successful action mapping we should have no devices available */ count.ndevices = 0; hr = IDirectInput8_EnumDevicesBySemantics(pDI, 0, &af, counting_callback, &count, DIEDBSFL_AVAILABLEDEVICES); ok (SUCCEEDED(hr), "EnumDevicesBySemantics failed hr=%08x\n", hr); diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index 0f2517d..7b983f3 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1,5 +1,5 @@ /* - * Misc marshaling routinues + * Misc marshaling routines * * Copyright 2009 Huw Davies * diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index fdfa44f..8829bf7 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -1538,7 +1538,7 @@ static BOOL ensure_uri_builder(nsWineURI *This) hres = CreateIUriBuilder(This->uri, 0, 0, &This->uri_builder); if(FAILED(hres)) { - WARN("CreateIUriBulder failed: %08x\n", hres); + WARN("CreateIUriBuilder failed: %08x\n", hres); return FALSE; } } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index bced22c..a646501 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -8499,7 +8499,7 @@ static void test_setAttributeNode(void) IXMLDOMElement_Release(elem); - /* initialy used element is released, attribute still 'has' a container */ + /* initially used element is released, attribute still 'has' a container */ hr = IXMLDOMDocument_get_documentElement(doc, &elem); ok( hr == S_OK, "got 0x%08x\n", hr); ret_attr = (void*)0xdeadbeef; diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 1e5b436..ceae2d7 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -150,12 +150,12 @@ static int MIDI_AlsaToWindowsDeviceType(unsigned int type) * MOD_SQSYNTH square wave internal synth * MOD_FMSYNTH FM internal synth * MOD_MAPPER MIDI mapper - * MOD_WAVETABLE hardware watetable internal synth + * MOD_WAVETABLE hardware wavetable internal synth * MOD_SWSYNTH software internal synth */ /* FIXME Is this really the correct equivalence from ALSA to - Windows Sound type */ + Windows Sound type? */ if (type & SND_SEQ_PORT_TYPE_SYNTH) return MOD_FMSYNTH; diff --git a/dlls/wineoss.drv/midi.c b/dlls/wineoss.drv/midi.c index 3b28213..7ca4cff 100644 --- a/dlls/wineoss.drv/midi.c +++ b/dlls/wineoss.drv/midi.c @@ -155,7 +155,7 @@ static int MIDI_UnixToWindowsDeviceType(int type) * MOD_SQSYNTH square wave internal synth * MOD_FMSYNTH FM internal synth * MOD_MAPPER MIDI mapper - * MOD_WAVETABLE hardware watetable internal synth + * MOD_WAVETABLE hardware wavetable internal synth * MOD_SWSYNTH software internal synth */ diff --git a/dlls/winex11.drv/dib_convert.c b/dlls/winex11.drv/dib_convert.c index c34e16c..0bca50d 100644 --- a/dlls/winex11.drv/dib_convert.c +++ b/dlls/winex11.drv/dib_convert.c @@ -1,5 +1,5 @@ /* - * DIB conversion routinues for cases where the source and destination + * DIB conversion routines for cases where the source and destination * have the same byte order. * * Copyright (C) 2001 Francois Gouget diff --git a/dlls/winex11.drv/dib_dst_swap.c b/dlls/winex11.drv/dib_dst_swap.c index cf0aa41..b81f48c 100644 --- a/dlls/winex11.drv/dib_dst_swap.c +++ b/dlls/winex11.drv/dib_dst_swap.c @@ -1,5 +1,5 @@ /* - * DIB conversion routinues for cases where the destination + * DIB conversion routines for cases where the destination * has non-native byte order. * * Copyright (C) 2003 Huw Davies diff --git a/dlls/winex11.drv/dib_src_swap.c b/dlls/winex11.drv/dib_src_swap.c index 65deed7..d260f98 100644 --- a/dlls/winex11.drv/dib_src_swap.c +++ b/dlls/winex11.drv/dib_src_swap.c @@ -1,5 +1,5 @@ /* - * DIB conversion routinues for cases where the source + * DIB conversion routines for cases where the source * has non-native byte order. * * Copyright (C) 2003 Huw Davies diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index eb79fb2..be1eead 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -530,7 +530,7 @@ mkdir foobar rd foobar echo %ErrorLevel% if not exist foobar echo dir removed -rem Removing non-existent directory +rem Removing nonexistent directory rmdir foobar echo %ErrorLevel% rem Removing single-level directories diff --git a/programs/wineconsole/winecon_private.h b/programs/wineconsole/winecon_private.h index ca5cb8c..951b45a 100644 --- a/programs/wineconsole/winecon_private.h +++ b/programs/wineconsole/winecon_private.h @@ -74,7 +74,7 @@ struct inner_data { void (*fnSetFont)(struct inner_data* data, const WCHAR* font, unsigned height, unsigned weight); void (*fnDeleteBackend)(struct inner_data* data); - void* private; /* data part belonging to the choosen backed */ + void* private; /* data part belonging to the chosen backed */ }; /* from wineconsole.c */ diff --git a/tools/winemaker b/tools/winemaker index a561076..2ee79ea 100755 --- a/tools/winemaker +++ b/tools/winemaker @@ -67,7 +67,7 @@ my $OPT_ASK_SKIP=-1; # The following constants define the architecture ## -# Default Architecture will be choosen +# Default Architecture will be chosen my $OPT_ARCH_DEFAULT=0; ##

1 0

Nikolay Sivov : include: Fix definition name.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 7381858e9860b8de8ba3d33ef30c64b3eb5d9c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7381858e9860b8de8ba3d33ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 13:11:20 2011 +0400 include: Fix definition name. --- include/winnt.h | 2 +- server/token.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 0be6040..5c58656 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4041,7 +4041,7 @@ typedef struct _ACL_SIZE_INFORMATION #define SE_PRIVILEGE_ENABLED_BY_DEFAULT 0x00000001 #define SE_PRIVILEGE_ENABLED 0x00000002 -#define SE_PRIVILEGE_REMOVE 0x00000004 +#define SE_PRIVILEGE_REMOVED 0x00000004 #define SE_PRIVILEGE_USED_FOR_ACCESS 0x80000000 #define PRIVILEGE_SET_ALL_NECESSARY 1 diff --git a/server/token.c b/server/token.c index e8e85fc..ab07a81 100644 --- a/server/token.c +++ b/server/token.c @@ -724,7 +724,7 @@ static unsigned int token_adjust_privileges( struct token *token, const LUID_AND continue; } - if (privs[i].Attributes & SE_PRIVILEGE_REMOVE) + if (privs[i].Attributes & SE_PRIVILEGE_REMOVED) privilege_remove( privilege ); else {

1 0

Alexandre Julliard : gdi32: Use GetImage to retrieve the brush bits in enhanced metafiles.
by Alexandre Julliard 03 Aug '11

03 Aug '11

Module: wine Branch: master Commit: 1aa35bea9a7ffdd087d2a5aebb25525a69a1e3ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aa35bea9a7ffdd087d2a5aeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 3 13:08:34 2011 +0200 gdi32: Use GetImage to retrieve the brush bits in enhanced metafiles. --- dlls/gdi32/enhmfdrv/objects.c | 84 +++++++++++------------------------------ 1 files changed, 22 insertions(+), 62 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c index fca6f63..454c6cb 100644 --- a/dlls/gdi32/enhmfdrv/objects.c +++ b/dlls/gdi32/enhmfdrv/objects.c @@ -105,36 +105,6 @@ HBITMAP EMFDRV_SelectBitmap( PHYSDEV dev, HBITMAP hbitmap ) } -/* Internal helper for EMFDRV_CreateBrushIndirect(): - * Change the padding of a bitmap from 16 (BMP) to 32 (DIB) bits. - */ -static inline void EMFDRV_PadTo32(LPBYTE lpRows, int height, int width) -{ - int bytes16 = 2 * ((width + 15) / 16); - int bytes32 = 4 * ((width + 31) / 32); - LPBYTE lpSrc, lpDst; - int i; - - if (!height) - return; - - height = abs(height) - 1; - lpSrc = lpRows + height * bytes16; - lpDst = lpRows + height * bytes32; - - /* Note that we work backwards so we can re-pad in place */ - while (height >= 0) - { - for (i = bytes32; i > bytes16; i--) - lpDst[i - 1] = 0; /* Zero the padding bytes */ - for (; i > 0; i--) - lpDst[i - 1] = lpSrc[i - 1]; /* Move image bytes into alignment */ - lpSrc -= bytes16; - lpDst -= bytes32; - height--; - } -} - /*********************************************************************** * EMFDRV_CreateBrushIndirect */ @@ -197,46 +167,36 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) case BS_PATTERN: { EMRCREATEDIBPATTERNBRUSHPT *emr; - BITMAPINFOHEADER *info; - BITMAP bm; - DWORD bmSize, biSize, size; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *dst_info, *src_info = (BITMAPINFO *)buffer; + struct gdi_image_bits bits; + DWORD size; - GetObjectA((HANDLE)logbrush.lbHatch, sizeof(bm), &bm); - - if (bm.bmBitsPixel != 1 || bm.bmPlanes != 1) + if (!get_bitmap_image( (HANDLE)logbrush.lbHatch, src_info, &bits )) break; + if (src_info->bmiHeader.biBitCount != 1) { FIXME("Trying to create a color pattern brush\n"); + if (bits.free) bits.free( &bits ); break; } - /* BMP will be aligned to 32 bits, not 16 */ - bmSize = get_dib_stride(bm.bmWidth, bm.bmBitsPixel) * bm.bmHeight; - - biSize = sizeof(BITMAPINFOHEADER); /* FIXME: There is an extra DWORD written by native before the BMI. * Not sure what its meant to contain. */ - size = sizeof(EMRCREATEDIBPATTERNBRUSHPT) + biSize + bmSize + sizeof(DWORD); + size = sizeof(EMRCREATEDIBPATTERNBRUSHPT) + sizeof(DWORD) + + sizeof(BITMAPINFOHEADER) + src_info->bmiHeader.biSizeImage; emr = HeapAlloc( GetProcessHeap(), 0, size ); if(!emr) - break; - - info = (BITMAPINFOHEADER *)((LPBYTE)emr + - sizeof(EMRCREATEDIBPATTERNBRUSHPT) + sizeof(DWORD)); - info->biSize = sizeof(BITMAPINFOHEADER); - info->biWidth = bm.bmWidth; - info->biHeight = bm.bmHeight; - info->biPlanes = bm.bmPlanes; - info->biBitCount = bm.bmBitsPixel; - info->biSizeImage = bmSize; - GetBitmapBits((HANDLE)logbrush.lbHatch, - bm.bmHeight * get_bitmap_stride(bm.bmWidth, bm.bmBitsPixel), - (LPBYTE)info + sizeof(BITMAPINFOHEADER)); - - /* Change the padding to be DIB compatible if needed */ - if (bm.bmWidth & 31) - EMFDRV_PadTo32((LPBYTE)info + sizeof(BITMAPINFOHEADER), bm.bmWidth, bm.bmHeight); + { + if (bits.free) bits.free( &bits ); + break; + } + + dst_info = (BITMAPINFO *)((LPBYTE)(emr + 1) + sizeof(DWORD)); + dst_info->bmiHeader = src_info->bmiHeader; + memcpy( &dst_info->bmiHeader + 1, bits.ptr, dst_info->bmiHeader.biSizeImage ); + if (bits.free) bits.free( &bits ); emr->emr.iType = EMR_CREATEMONOBRUSH; emr->emr.nSize = size; @@ -249,10 +209,10 @@ DWORD EMFDRV_CreateBrushIndirect( PHYSDEV dev, HBRUSH hBrush ) * FIXME: It may be that the DIB functions themselves accept this value. */ emr->iUsage = DIB_PAL_MONO; - emr->offBmi = (LPBYTE)info - (LPBYTE)emr; - emr->cbBmi = biSize; - emr->offBits = emr->offBmi + biSize; - emr->cbBits = bmSize; + emr->offBmi = (LPBYTE)dst_info - (LPBYTE)emr; + emr->cbBmi = sizeof( BITMAPINFOHEADER ); + emr->offBits = emr->offBmi + emr->cbBmi; + emr->cbBits = dst_info->bmiHeader.biSizeImage; if(!EMFDRV_WriteRecord( dev, &emr->emr )) index = 0;

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
77
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 August 2011