March 2008 - Wine-Commits - list.winehq.org

Stefan Leichter : shell32: Fix SHGetFolderPathAndSubDir tests.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: wine Branch: master Commit: a7ebdf2ebad97929577165cba765f9f0a7ca9d28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7ebdf2ebad97929577165cba… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Mar 13 23:23:44 2008 +0100 shell32: Fix SHGetFolderPathAndSubDir tests. --- dlls/shell32/tests/shlfolder.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 033447d..5c43d38 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1414,7 +1414,18 @@ static void testSHGetFolderPathAndSubDirA(void) /* test invalid forth parameter */ ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, 2, wine, testpath); - ok(E_INVALIDARG == ret, "expected E_INVALIDARG, got %x\n", ret); + switch(ret) { + case S_OK: /* winvista */ + ok(!strncmp(appdata, testpath, strlen(appdata)), + "expected %s to start with %s\n", testpath, appdata); + ok(!lstrcmpA(&testpath[1 + strlen(appdata)], winetemp), + "expected %s to end with %s\n", testpath, winetemp); + break; + case E_INVALIDARG: /* winxp, win2k3 */ + break; + default: + ok(0, "expected S_OK or E_INVALIDARG, got %x\n", ret); + } /* test fifth parameter */ testpath[0] = '\0'; @@ -1438,7 +1449,7 @@ static void testSHGetFolderPathAndSubDirA(void) testpath[0] = '\0'; ret = pSHGetFolderPathAndSubDirA(NULL, CSIDL_FLAG_DONT_VERIFY | CSIDL_LOCAL_APPDATA, NULL, SHGFP_TYPE_CURRENT, wine, NULL); - ok(S_OK == ret, "expected S_OK, got %x\n", ret); + ok((S_OK == ret) || (E_INVALIDARG == ret), "expected S_OK or E_INVALIDARG, got %x\n", ret); /* test a not existing path */ testpath[0] = '\0';

1 0

Jason Edmeades : user32: Fix MessageBox button contents and ordering.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: wine Branch: master Commit: 78d0940e21d37666e20cb317edd226fe2afbdf46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d0940e21d37666e20cb317e… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Thu Mar 13 21:21:02 2008 +0000 user32: Fix MessageBox button contents and ordering. --- dlls/user32/msgbox.c | 44 +++++++++++++++++++++++++++++++----- dlls/user32/resources/user32_Bg.rc | 3 ++ dlls/user32/resources/user32_Ca.rc | 3 ++ dlls/user32/resources/user32_Cs.rc | 3 ++ dlls/user32/resources/user32_Da.rc | 3 ++ dlls/user32/resources/user32_De.rc | 3 ++ dlls/user32/resources/user32_En.rc | 3 ++ dlls/user32/resources/user32_Eo.rc | 3 ++ dlls/user32/resources/user32_Es.rc | 3 ++ dlls/user32/resources/user32_Fi.rc | 3 ++ dlls/user32/resources/user32_Fr.rc | 3 ++ dlls/user32/resources/user32_Hu.rc | 3 ++ dlls/user32/resources/user32_It.rc | 3 ++ dlls/user32/resources/user32_Ja.rc | 3 ++ dlls/user32/resources/user32_Ko.rc | 3 ++ dlls/user32/resources/user32_Nl.rc | 3 ++ dlls/user32/resources/user32_No.rc | 3 ++ dlls/user32/resources/user32_Pl.rc | 3 ++ dlls/user32/resources/user32_Pt.rc | 3 ++ dlls/user32/resources/user32_Ru.rc | 3 ++ dlls/user32/resources/user32_Si.rc | 3 ++ dlls/user32/resources/user32_Sk.rc | 3 ++ dlls/user32/resources/user32_Sv.rc | 3 ++ dlls/user32/resources/user32_Tr.rc | 3 ++ dlls/user32/resources/user32_Uk.rc | 3 ++ dlls/user32/resources/user32_Wa.rc | 3 ++ dlls/user32/resources/user32_Zh.rc | 6 +++++ include/winuser.h | 1 + 28 files changed, 120 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78d0940e21d37666e20cb…

1 0

Andrew Talbot : riched20: Assign to structs instead of using memcpy ( with typo fixes).
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: wine Branch: master Commit: 612e4c2b174e93793d7de400088db344f0dcc2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=612e4c2b174e93793d7de4000… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 13 20:52:32 2008 +0000 riched20: Assign to structs instead of using memcpy (with typo fixes). --- dlls/riched20/clipboard.c | 6 +++--- dlls/riched20/editor.c | 2 +- dlls/riched20/style.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index e9b5cd0..ce986ed 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -252,14 +252,14 @@ static HRESULT WINAPI DataObjectImpl_QueryGetData(IDataObject* iface, FORMATETC return foundFormat?DV_E_FORMATETC:DV_E_TYMED; } -static HRESULT WINAPI DataObjectImpl_GetCanonicalFormatEtc(IDataObject* iface, FORMATETC *pformatectIn, +static HRESULT WINAPI DataObjectImpl_GetCanonicalFormatEtc(IDataObject* iface, FORMATETC *pformatetcIn, FORMATETC *pformatetcOut) { DataObjectImpl *This = (DataObjectImpl*)iface; - TRACE("(%p)->(%p,%p)\n", This, pformatectIn, pformatetcOut); + TRACE("(%p)->(%p,%p)\n", This, pformatetcIn, pformatetcOut); if(pformatetcOut) { - memcpy(pformatetcOut, pformatectIn, sizeof(FORMATETC)); + *pformatetcOut = *pformatetcIn; pformatetcOut->ptd = NULL; } return DATA_S_SAMEFORMATETC; diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 6aa21a7..84f7572 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -898,7 +898,7 @@ static void ME_RTFReadHook(RTF_Info *info) { { case rtfBeginGroup: if (info->stackTop < maxStack) { - memcpy(&info->stack[info->stackTop].fmt, &info->style->fmt, sizeof(CHARFORMAT2W)); + info->stack[info->stackTop].fmt = info->style->fmt; info->stack[info->stackTop].codePage = info->codePage; info->stack[info->stackTop].unicodeLength = info->unicodeLength; } diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 8d67de3..ffca9d6 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -403,7 +403,7 @@ HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s) TRACE_(richedit_style)("font created %d\n", nEmpty); item->hFont = s->hFont; item->nRefs = 1; - memcpy(&item->lfSpecs, &lf, sizeof(LOGFONTW)); + item->lfSpecs = lf; } hOldFont = SelectObject(c->hDC, s->hFont); /* should be cached too, maybe ? */

1 0

Andrew Talbot : oledlg: Assign to structs instead of using memcpy.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: wine Branch: master Commit: 1b2dc823d293fdb2f189c011711d5e99cfce1d94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2dc823d293fdb2f189c0117… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 13 20:52:16 2008 +0000 oledlg: Assign to structs instead of using memcpy. --- dlls/oledlg/insobjdlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oledlg/insobjdlg.c b/dlls/oledlg/insobjdlg.c index 4578bbe..e875048 100644 --- a/dlls/oledlg/insobjdlg.c +++ b/dlls/oledlg/insobjdlg.c @@ -377,7 +377,7 @@ static BOOL UIINSERTOBJECTDLG_PopulateObjectTypes(InsertObjectDlgInfo* pdlgInfo) if (ERROR_SUCCESS == RegQueryValueW(hkey, NULL, keydesc, &len)) { CLSID* lpclsid = HeapAlloc(GetProcessHeap(), 0, sizeof(CLSID)); - memcpy(lpclsid, &clsid, sizeof(CLSID)); + *lpclsid = clsid; len = SendMessageW(pdlgInfo->hwndObjTypeLB, LB_ADDSTRING, 0, (LPARAM)keydesc); SendMessageW(pdlgInfo->hwndObjTypeLB, LB_SETITEMDATA, (WPARAM)len, (LPARAM)lpclsid); @@ -453,7 +453,7 @@ static BOOL UIINSERTOBJECTDLG_OnOpen(InsertObjectDlgInfo* pdlgInfo) { CLSID* clsid = (CLSID*) SendMessageA(pdlgInfo->hwndObjTypeLB, LB_GETITEMDATA, (WPARAM)index, 0); - memcpy(&pdlgInfo->lpOleUIInsertObject->clsid, clsid, sizeof(CLSID)); + pdlgInfo->lpOleUIInsertObject->clsid = *clsid; if (pdlgInfo->lpOleUIInsertObject->dwFlags & IOF_CREATENEWOBJECT) {

1 0

Andrew Talbot : rpcrt4: Assign to structs instead of using memcpy.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: wine Branch: master Commit: db6a901bf45d439e0d09a9df19eecd71d3def07b URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6a901bf45d439e0d09a9df1… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 13 20:52:48 2008 +0000 rpcrt4: Assign to structs instead of using memcpy. --- dlls/rpcrt4/ndr_contexthandle.c | 2 +- dlls/rpcrt4/rpc_binding.c | 6 +++--- dlls/rpcrt4/rpc_message.c | 6 +++--- dlls/rpcrt4/rpc_server.c | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/ndr_contexthandle.c b/dlls/rpcrt4/ndr_contexthandle.c index 8ed8f66..054bba3 100644 --- a/dlls/rpcrt4/ndr_contexthandle.c +++ b/dlls/rpcrt4/ndr_contexthandle.c @@ -183,7 +183,7 @@ static UINT ndr_update_context_handle(NDR_CCONTEXT *CContext, che->magic = NDR_CONTEXT_HANDLE_MAGIC; RpcBindingCopy(hBinding, &che->handle); list_add_tail(&context_handle_list, &che->entry); - memcpy(&che->wire_data, chi, sizeof *chi); + che->wire_data = *chi; } *CContext = che; diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index d86add3..7293032 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -227,7 +227,7 @@ RPC_STATUS RPCRT4_ResolveBinding(RpcBinding* Binding, LPCSTR Endpoint) RPC_STATUS RPCRT4_SetBindingObject(RpcBinding* Binding, const UUID* ObjectUuid) { TRACE("(*RpcBinding == ^%p, UUID == %s)\n", Binding, debugstr_guid(ObjectUuid)); - if (ObjectUuid) memcpy(&Binding->ObjectUuid, ObjectUuid, sizeof(UUID)); + if (ObjectUuid) Binding->ObjectUuid = *ObjectUuid; else UuidCreateNil(&Binding->ObjectUuid); return RPC_S_OK; } @@ -691,10 +691,10 @@ RPC_STATUS WINAPI RpcBindingInqObject( RPC_BINDING_HANDLE Binding, UUID* ObjectU RpcBinding* bind = (RpcBinding*)Binding; TRACE("(%p,%p) = %s\n", Binding, ObjectUuid, debugstr_guid(&bind->ObjectUuid)); - memcpy(ObjectUuid, &bind->ObjectUuid, sizeof(UUID)); + *ObjectUuid = bind->ObjectUuid; return RPC_S_OK; } - + /*********************************************************************** * RpcBindingSetObject (RPCRT4.@) */ diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index fda8867..bc33c87 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -196,8 +196,8 @@ RpcPktHdr *RPCRT4_BuildBindHeader(unsigned long DataRepresentation, header->bind.assoc_gid = AssocGroupId; header->bind.num_elements = 1; header->bind.num_syntaxes = 1; - memcpy(&header->bind.abstract, AbstractId, sizeof(RPC_SYNTAX_IDENTIFIER)); - memcpy(&header->bind.transfer, TransferId, sizeof(RPC_SYNTAX_IDENTIFIER)); + header->bind.abstract = *AbstractId; + header->bind.transfer = *TransferId; return header; } @@ -278,7 +278,7 @@ RpcPktHdr *RPCRT4_BuildBindAckHeader(unsigned long DataRepresentation, results->results[0].result = Result; results->results[0].reason = Reason; transfer_id = (RPC_SYNTAX_IDENTIFIER*)(results + 1); - memcpy(transfer_id, TransferId, sizeof(RPC_SYNTAX_IDENTIFIER)); + *transfer_id = *TransferId; return header; } diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 7849e4e..40e9e7e 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -845,7 +845,7 @@ RPC_STATUS WINAPI RpcServerRegisterIf2( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, sif = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcServerInterface)); sif->If = If; if (MgrTypeUuid) { - memcpy(&sif->MgrTypeUuid, MgrTypeUuid, sizeof(UUID)); + sif->MgrTypeUuid = *MgrTypeUuid; sif->MgrEpv = MgrEpv; } else { memset(&sif->MgrTypeUuid, 0, sizeof(UUID)); @@ -977,8 +977,8 @@ RPC_STATUS WINAPI RpcObjectSetType( UUID* ObjUuid, UUID* TypeUuid ) return RPC_S_ALREADY_REGISTERED; /* ... otherwise create a new one and add it in. */ map = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcObjTypeMap)); - memcpy(&map->Object, ObjUuid, sizeof(UUID)); - memcpy(&map->Type, TypeUuid, sizeof(UUID)); + map->Object = *ObjUuid; + map->Type = *TypeUuid; map->next = NULL; if (prev) prev->next = map; /* prev is the last map in the linklist */

1 0

Andrew Talbot : ole32: Assign to structs instead of using memcpy.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: wine Branch: master Commit: fd6ae974868d49782089f0223ea7ad25a6be13e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd6ae974868d49782089f0223… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Thu Mar 13 20:52:00 2008 +0000 ole32: Assign to structs instead of using memcpy. --- dlls/ole32/enumx.c | 2 +- dlls/ole32/stg_prop.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/enumx.c b/dlls/ole32/enumx.c index 9610dbe..ea85092 100644 --- a/dlls/ole32/enumx.c +++ b/dlls/ole32/enumx.c @@ -177,7 +177,7 @@ enumx_impl *enumx_allocate(REFIID riid, const void *vtbl, ULONG elem_size) enumx->ref = 1; enumx->current = NULL; enumx->elem_size = elem_size; - memcpy(&enumx->riid, riid, sizeof *riid); + enumx->riid = *riid; list_init(&enumx->elements); } diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 20d9ec3..d016d4e 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -887,7 +887,7 @@ static HRESULT WINAPI IPropertyStorage_fnSetClass( return E_INVALIDARG; if (!(This->grfMode & STGM_READWRITE)) return STG_E_ACCESSDENIED; - memcpy(&This->clsid, clsid, sizeof(This->clsid)); + This->clsid = *clsid; This->dirty = TRUE; if (This->grfFlags & PROPSETFLAG_UNBUFFERED) IPropertyStorage_Commit(iface, STGC_DEFAULT);

1 0

Marcus Meissner : msi: Initialize variables.
by Alexandre Julliard March 14, 2008

March 14, 2008

Module: wine Branch: master Commit: db71fb15aa6fc0720f8e5bd68b23c435cd04eee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db71fb15aa6fc0720f8e5bd68… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Mar 13 21:54:48 2008 +0100 msi: Initialize variables. --- dlls/msi/action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2e5b8ee..8e753bf 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4471,7 +4471,7 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) MSIFILE *file; SC_HANDLE hscm, service = NULL; LPCWSTR comp, depends, pass; - LPWSTR name, disp; + LPWSTR name = NULL, disp = NULL; LPCWSTR load_order, serv_name, key; DWORD serv_type, start_type; DWORD err_control;

1 0

Joris Huizer : wininet: Fixed typos in two out-of-memory checks.
by Alexandre Julliard March 13, 2008

March 13, 2008

Module: wine Branch: master Commit: 4fca67e651e82608279ab8f637e098c5b4bc442e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fca67e651e82608279ab8f63… Author: Joris Huizer <jorishuizer(a)debian> Date: Thu Mar 13 17:41:49 2008 +0100 wininet: Fixed typos in two out-of-memory checks. --- dlls/wininet/urlcache.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index d42192a..70aac95 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2961,7 +2961,7 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryA(LPCSTR lpszUrlSearchPattern, { int len = MultiByteToWideChar(CP_ACP, 0, lpszUrlSearchPattern, -1, NULL, 0); pEntryHandle->lpszUrlSearchPattern = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); - if (!pEntryHandle) + if (!pEntryHandle->lpszUrlSearchPattern) { HeapFree(GetProcessHeap(), 0, pEntryHandle); return NULL; @@ -3002,7 +3002,7 @@ INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryW(LPCWSTR lpszUrlSearchPattern, { int len = strlenW(lpszUrlSearchPattern); pEntryHandle->lpszUrlSearchPattern = HeapAlloc(GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR)); - if (!pEntryHandle) + if (!pEntryHandle->lpszUrlSearchPattern) { HeapFree(GetProcessHeap(), 0, pEntryHandle); return NULL;

1 0

Artur Szymiec : wined3d: Add a device uuid.
by Alexandre Julliard March 13, 2008

March 13, 2008

Module: wine Branch: master Commit: 102b9d12e48cdc58254aa3e098d00af92480a5d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=102b9d12e48cdc58254aa3e09… Author: Artur Szymiec <artur.szymiec(a)gmail.com> Date: Thu Mar 13 15:14:00 2008 +0100 wined3d: Add a device uuid. --- dlls/wined3d/directx.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 04af700..e852d6b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -36,6 +36,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_caps); +/* The d3d device ID */ +static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; + /* Extension detection */ static const struct { const char *extension_string; @@ -1594,8 +1597,8 @@ static HRESULT WINAPI IWineD3DImpl_GetAdapterIdentifier(IWineD3D *iface, UINT Ad *(pIdentifier->DeviceId) = Adapters[Adapter].gl_info.gl_card; *(pIdentifier->SubSysId) = 0; *(pIdentifier->Revision) = 0; + *pIdentifier->DeviceIdentifier = IID_D3DDEVICE_D3DUID; - /*FIXME: memcpy(&pIdentifier->DeviceIdentifier, ??, sizeof(??GUID)); */ if (Flags & WINED3DENUM_NO_WHQL_LEVEL) { *(pIdentifier->WHQLLevel) = 0; } else {

1 0

Rob Shearman : wine.inf: Update timezone information.
by Alexandre Julliard March 13, 2008

March 13, 2008

Module: wine Branch: master Commit: a9947cdf7d091599e73244cce0c963480b877075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9947cdf7d091599e73244cce… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 13 16:13:59 2008 +0000 wine.inf: Update timezone information. --- tools/wine.inf | 70 ++++++++++++++++++++++++++----------------------------- 1 files changed, 33 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9947cdf7d091599e7324…

1 0