December 2013 - Wine-Commits

Henri Verbeet : wined3d: Get rid of the buffer_object_size field from struct wined3d_buffer.
by Alexandre Julliard Dec. 6, 2013

Dec. 6, 2013

Module: wine Branch: master Commit: da3549315f1287f63be4a73fb8efa743871a2d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da3549315f1287f63be4a73fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 6 11:09:52 2013 +0100 wined3d: Get rid of the buffer_object_size field from struct wined3d_buffer. --- dlls/wined3d/buffer.c | 1 - dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index de06ae8..0883054 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -189,7 +189,6 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wine goto fail; } - This->buffer_object_size = This->resource.size; This->buffer_object_usage = gl_usage; if (This->flags & WINED3D_BUFFER_DOUBLEBUFFER) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb685e2..53ef570 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2552,7 +2552,6 @@ struct wined3d_buffer GLuint buffer_object; GLenum buffer_object_usage; GLenum buffer_type_hint; - UINT buffer_object_size; DWORD flags; struct wined3d_map_range *maps;

1 0

Nikolay Sivov : ole32: COM cleanup of IEnumGUID implementations.
by Alexandre Julliard Dec. 6, 2013

Dec. 6, 2013

Module: wine Branch: master Commit: 03f2b6e989afa1bf23eeb254f77784584b2d7e2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=03f2b6e989afa1bf23eeb254f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 6 16:04:25 2013 +0400 ole32: COM cleanup of IEnumGUID implementations. --- dlls/ole32/comcat.c | 160 +++++++++++++++++++++++++++------------------------ 1 files changed, 85 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03f2b6e989afa1bf23eeb…

1 0

Nikolay Sivov : ole32: Use private define for char length of GUID string representation.
by Alexandre Julliard Dec. 6, 2013

Dec. 6, 2013

Module: wine Branch: master Commit: 4de8d4b0bab29b33c2c674e0e07346a58cbee76e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de8d4b0bab29b33c2c674e0e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 6 16:04:43 2013 +0400 ole32: Use private define for char length of GUID string representation. --- dlls/ole32/comcat.c | 56 +++++++++++++++++++++++++------------------------- 1 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index e2bfbe2..2fcabd5 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -84,14 +84,14 @@ static HRESULT COMCAT_RegisterClassCategories( ULONG cCategories, const CATID *rgcatid) { - WCHAR keyname[39]; + WCHAR keyname[CHARS_IN_GUID]; HRESULT res; HKEY clsid_key, class_key, type_key; if (cCategories && rgcatid == NULL) return E_POINTER; /* Format the class key name. */ - res = StringFromGUID2(rclsid, keyname, 39); + res = StringFromGUID2(rclsid, keyname, CHARS_IN_GUID); if (FAILED(res)) return res; /* Create (or open) the CLSID key. */ @@ -108,7 +108,7 @@ static HRESULT COMCAT_RegisterClassCategories( HKEY key; /* Format the category key name. */ - res = StringFromGUID2(rgcatid, keyname, 39); + res = StringFromGUID2(rgcatid, keyname, CHARS_IN_GUID); if (FAILED(res)) continue; /* Do the register. */ @@ -140,7 +140,7 @@ static HRESULT COMCAT_UnRegisterClassCategories( if (cCategories && rgcatid == NULL) return E_POINTER; /* Format the class category type key name. */ - res = StringFromGUID2(rclsid, keyname + 6, 39); + res = StringFromGUID2(rclsid, keyname + 6, CHARS_IN_GUID); if (FAILED(res)) return res; keyname[44] = '\\'; lstrcpyW(keyname + 45, type); @@ -151,7 +151,7 @@ static HRESULT COMCAT_UnRegisterClassCategories( for (; cCategories; --cCategories, ++rgcatid) { /* Format the category key name. */ - res = StringFromGUID2(rgcatid, keyname, 39); + res = StringFromGUID2(rgcatid, keyname, CHARS_IN_GUID); if (FAILED(res)) continue; /* Do the unregister. */ @@ -199,21 +199,21 @@ static struct class_categories *COMCAT_PrepareClassCategories( categories = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct class_categories) + - ((impl_count + req_count) * 39 + 2) * sizeof(WCHAR)); + ((impl_count + req_count) * CHARS_IN_GUID + 2) * sizeof(WCHAR)); if (categories == NULL) return categories; strings = (WCHAR *)(categories + 1); categories->impl_strings = strings; while (impl_count--) { - StringFromGUID2(impl_catids++, strings, 39); - strings += 39; + StringFromGUID2(impl_catids++, strings, CHARS_IN_GUID); + strings += CHARS_IN_GUID; } *strings++ = 0; categories->req_strings = strings; while (req_count--) { - StringFromGUID2(req_catids++, strings, 39); - strings += 39; + StringFromGUID2(req_catids++, strings, CHARS_IN_GUID); + strings += CHARS_IN_GUID; } *strings++ = 0; @@ -236,7 +236,7 @@ static HRESULT COMCAT_IsClassOfCategories( if (*categories->impl_strings) { res = open_classes_key(key, impl_keyname, KEY_READ, &subkey); if (res != ERROR_SUCCESS) return S_FALSE; - for (string = categories->impl_strings; *string; string += 39) { + for (string = categories->impl_strings; *string; string += CHARS_IN_GUID) { HKEY catkey; res = open_classes_key(subkey, string, 0, &catkey); if (res != ERROR_SUCCESS) { @@ -252,14 +252,14 @@ static HRESULT COMCAT_IsClassOfCategories( res = open_classes_key(key, req_keyname, KEY_READ, &subkey); if (res == ERROR_SUCCESS) { for (index = 0; ; ++index) { - WCHAR keyname[39]; - DWORD size = 39; + WCHAR keyname[CHARS_IN_GUID]; + DWORD size = CHARS_IN_GUID; res = RegEnumKeyExW(subkey, index, keyname, &size, NULL, NULL, NULL, NULL); if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) break; - if (size != 38) continue; /* bogus catid in registry */ - for (string = categories->req_strings; *string; string += 39) + if (size != CHARS_IN_GUID-1) continue; /* bogus catid in registry */ + for (string = categories->req_strings; *string; string += CHARS_IN_GUID) if (!strcmpiW(string, keyname)) break; if (!*string) { RegCloseKey(subkey); @@ -337,12 +337,12 @@ static HRESULT WINAPI COMCAT_ICatRegister_RegisterCategories( for (; cCategories; --cCategories, ++rgci) { static const WCHAR fmt[] = { '%', 'l', 'X', 0 }; - WCHAR keyname[39]; + WCHAR keyname[CHARS_IN_GUID]; WCHAR valname[9]; HKEY cat_key; /* Create (or open) the key for this category. */ - if (!StringFromGUID2(&rgci->catid, keyname, 39)) continue; + if (!StringFromGUID2(&rgci->catid, keyname, CHARS_IN_GUID)) continue; res = create_classes_key(comcat_key, keyname, KEY_READ|KEY_WRITE, &cat_key); if (res != ERROR_SUCCESS) continue; @@ -379,10 +379,10 @@ static HRESULT WINAPI COMCAT_ICatRegister_UnRegisterCategories( if (res != ERROR_SUCCESS) return E_FAIL; for (; cCategories; --cCategories, ++rgcatid) { - WCHAR keyname[39]; + WCHAR keyname[CHARS_IN_GUID]; /* Delete the key for this category. */ - if (!StringFromGUID2(rgcatid, keyname, 39)) continue; + if (!StringFromGUID2(rgcatid, keyname, CHARS_IN_GUID)) continue; RegDeleteKeyW(comcat_key, keyname); } @@ -515,7 +515,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_GetCategoryDesc( if (rcatid == NULL || ppszDesc == NULL) return E_INVALIDARG; /* Open the key for this category. */ - if (!StringFromGUID2(rcatid, keyname + 21, 39)) return E_FAIL; + if (!StringFromGUID2(rcatid, keyname + 21, CHARS_IN_GUID)) return E_FAIL; res = open_classes_key(HKEY_CLASSES_ROOT, keyname, KEY_READ, &key); if (res != ERROR_SUCCESS) return CAT_E_CATIDNOEXIST; @@ -602,7 +602,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_IsClassOfCategories( if ((cImplemented && rgcatidImpl == NULL) || (cRequired && rgcatidReq == NULL)) return E_POINTER; - res = StringFromGUID2(rclsid, keyname + 6, 39); + res = StringFromGUID2(rclsid, keyname + 6, CHARS_IN_GUID); if (FAILED(res)) return res; categories = COMCAT_PrepareClassCategories(cImplemented, rgcatidImpl, @@ -872,8 +872,8 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Next( if (This->key) while (fetched < celt) { LSTATUS res; HRESULT hr; - WCHAR catid[39]; - DWORD cName = 39; + WCHAR catid[CHARS_IN_GUID]; + DWORD cName = CHARS_IN_GUID; HKEY subkey; res = RegEnumKeyExW(This->key, This->next_index, catid, &cName, @@ -1061,8 +1061,8 @@ static HRESULT WINAPI CLSIDEnumGUID_Next( if (This->key) while (fetched < celt) { LSTATUS res; HRESULT hr; - WCHAR clsid[39]; - DWORD cName = 39; + WCHAR clsid[CHARS_IN_GUID]; + DWORD cName = CHARS_IN_GUID; HKEY subkey; res = RegEnumKeyExW(This->key, This->next_index, clsid, &cName, @@ -1251,8 +1251,8 @@ static HRESULT WINAPI CATIDEnumGUID_Next( if (This->key) while (fetched < celt) { LSTATUS res; HRESULT hr; - WCHAR catid[39]; - DWORD cName = 39; + WCHAR catid[CHARS_IN_GUID]; + DWORD cName = CHARS_IN_GUID; res = RegEnumKeyExW(This->key, This->next_index, catid, &cName, NULL, NULL, NULL, NULL); @@ -1340,7 +1340,7 @@ static IEnumGUID* CATIDEnumGUID_Construct( This->IEnumGUID_iface.lpVtbl = &CATIDEnumGUIDVtbl; memcpy(This->keyname, prefix, sizeof(prefix)); - StringFromGUID2(rclsid, This->keyname + 6, 39); + StringFromGUID2(rclsid, This->keyname + 6, CHARS_IN_GUID); lstrcpyW(This->keyname + 44, postfix); open_classes_key(HKEY_CLASSES_ROOT, This->keyname, KEY_READ, &This->key); }

1 0

Nikolay Sivov : ole32: Store categories with offset so it' s possible to copy them directly.
by Alexandre Julliard Dec. 6, 2013

Dec. 6, 2013

Module: wine Branch: master Commit: aeb35b20ec4594b81e8b0640bc6c653c942bb2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeb35b20ec4594b81e8b0640b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 6 16:05:09 2013 +0400 ole32: Store categories with offset so it's possible to copy them directly. --- dlls/ole32/comcat.c | 68 ++++++++++++++++++++++++++++---------------------- 1 files changed, 38 insertions(+), 30 deletions(-) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index 2fcabd5..91244da 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -54,9 +54,11 @@ static ComCatMgrImpl COMCAT_ComCatMgr = { &COMCAT_ICatInformation_Vtbl } }; -struct class_categories { - LPCWSTR impl_strings; - LPCWSTR req_strings; +struct class_categories +{ + ULONG size; /* total length, including structure itself */ + ULONG impl_offset; + ULONG req_offset; }; static IEnumCATEGORYINFO *COMCAT_IEnumCATEGORYINFO_Construct(LCID lcid); @@ -195,22 +197,23 @@ static struct class_categories *COMCAT_PrepareClassCategories( { struct class_categories *categories; WCHAR *strings; + ULONG size; - categories = HeapAlloc( - GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(struct class_categories) + - ((impl_count + req_count) * CHARS_IN_GUID + 2) * sizeof(WCHAR)); + size = sizeof(struct class_categories) + ((impl_count + req_count)*CHARS_IN_GUID + 2)*sizeof(WCHAR); + categories = HeapAlloc(GetProcessHeap(), 0, size); if (categories == NULL) return categories; + categories->size = size; + categories->impl_offset = sizeof(struct class_categories); + categories->req_offset = categories->impl_offset + (impl_count*CHARS_IN_GUID + 1)*sizeof(WCHAR); + strings = (WCHAR *)(categories + 1); - categories->impl_strings = strings; while (impl_count--) { StringFromGUID2(impl_catids++, strings, CHARS_IN_GUID); strings += CHARS_IN_GUID; } *strings++ = 0; - categories->req_strings = strings; while (req_count--) { StringFromGUID2(req_catids++, strings, CHARS_IN_GUID); strings += CHARS_IN_GUID; @@ -227,16 +230,20 @@ static HRESULT COMCAT_IsClassOfCategories( HKEY key, struct class_categories const* categories) { + const WCHAR *impl_strings, *req_strings; HKEY subkey; HRESULT res; DWORD index; LPCWSTR string; + impl_strings = (WCHAR*)((BYTE*)categories + categories->impl_offset); + req_strings = (WCHAR*)((BYTE*)categories + categories->req_offset); + /* Check that every given category is implemented by class. */ - if (*categories->impl_strings) { + if (*impl_strings) { res = open_classes_key(key, impl_keyname, KEY_READ, &subkey); if (res != ERROR_SUCCESS) return S_FALSE; - for (string = categories->impl_strings; *string; string += CHARS_IN_GUID) { + for (string = impl_strings; *string; string += CHARS_IN_GUID) { HKEY catkey; res = open_classes_key(subkey, string, 0, &catkey); if (res != ERROR_SUCCESS) { @@ -259,7 +266,7 @@ static HRESULT COMCAT_IsClassOfCategories( NULL, NULL, NULL, NULL); if (res != ERROR_SUCCESS && res != ERROR_MORE_DATA) break; if (size != CHARS_IN_GUID-1) continue; /* bogus catid in registry */ - for (string = categories->req_strings; *string; string += CHARS_IN_GUID) + for (string = req_strings; *string; string += CHARS_IN_GUID) if (!strcmpiW(string, keyname)) break; if (!*string) { RegCloseKey(subkey); @@ -1115,33 +1122,34 @@ static HRESULT WINAPI CLSIDEnumGUID_Clone( IEnumGUID *iface, IEnumGUID **ppenum) { + static const WCHAR keynameW[] = {'C','L','S','I','D',0}; CLSID_IEnumGUIDImpl *This = impl_from_IEnumCLSID(iface); - static const WCHAR keyname[] = { 'C', 'L', 'S', 'I', 'D', 0 }; - CLSID_IEnumGUIDImpl *new_this; - DWORD size; + CLSID_IEnumGUIDImpl *cloned; - TRACE("\n"); + TRACE("(%p)->(%p)\n", This, ppenum); if (ppenum == NULL) return E_POINTER; - new_this = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CLSID_IEnumGUIDImpl)); - if (new_this == NULL) return E_OUTOFMEMORY; + *ppenum = NULL; - new_this->IEnumGUID_iface.lpVtbl = This->IEnumGUID_iface.lpVtbl; - new_this->ref = 1; - size = HeapSize(GetProcessHeap(), 0, This->categories); - new_this->categories = - HeapAlloc(GetProcessHeap(), 0, size); - if (new_this->categories == NULL) { - HeapFree(GetProcessHeap(), 0, new_this); + cloned = HeapAlloc(GetProcessHeap(), 0, sizeof(CLSID_IEnumGUIDImpl)); + if (cloned == NULL) return E_OUTOFMEMORY; + + cloned->IEnumGUID_iface.lpVtbl = This->IEnumGUID_iface.lpVtbl; + cloned->ref = 1; + + cloned->categories = HeapAlloc(GetProcessHeap(), 0, This->categories->size); + if (cloned->categories == NULL) { + HeapFree(GetProcessHeap(), 0, cloned); return E_OUTOFMEMORY; } - memcpy(new_this->categories, This->categories, size); - /* FIXME: could we more efficiently use DuplicateHandle? */ - open_classes_key(HKEY_CLASSES_ROOT, keyname, KEY_READ, &new_this->key); - new_this->next_index = This->next_index; + memcpy(cloned->categories, This->categories, This->categories->size); - *ppenum = &new_this->IEnumGUID_iface; + cloned->key = NULL; + open_classes_key(HKEY_CLASSES_ROOT, keynameW, KEY_READ, &cloned->key); + cloned->next_index = This->next_index; + + *ppenum = &cloned->IEnumGUID_iface; return S_OK; }

1 0

Nikolay Sivov : ole32: Fix refcount of returned enumeration instances.
by Alexandre Julliard Dec. 6, 2013

Dec. 6, 2013

Module: wine Branch: master Commit: b968c9c5420619000a9a98e99c829df2b1e395dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b968c9c5420619000a9a98e99… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 6 16:05:28 2013 +0400 ole32: Fix refcount of returned enumeration instances. --- dlls/ole32/comcat.c | 111 ++++++++++++++++++++++++++++---------------------- 1 files changed, 62 insertions(+), 49 deletions(-) diff --git a/dlls/ole32/comcat.c b/dlls/ole32/comcat.c index 91244da..b8dcc53 100644 --- a/dlls/ole32/comcat.c +++ b/dlls/ole32/comcat.c @@ -61,9 +61,9 @@ struct class_categories ULONG req_offset; }; -static IEnumCATEGORYINFO *COMCAT_IEnumCATEGORYINFO_Construct(LCID lcid); -static IEnumGUID* CLSIDEnumGUID_Construct(struct class_categories *class_categories); -static IEnumGUID* CATIDEnumGUID_Construct(REFCLSID rclsid, LPCWSTR impl_req); +static HRESULT EnumCATEGORYINFO_Construct(LCID lcid, IEnumCATEGORYINFO **ret); +static HRESULT CLSIDEnumGUID_Construct(struct class_categories *class_categories, IEnumCLSID **ret); +static HRESULT CATIDEnumGUID_Construct(REFCLSID rclsid, LPCWSTR impl_req, IEnumCATID **ret); /********************************************************************** * File-scope string constants @@ -496,10 +496,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumCategories( if (ppenumCatInfo == NULL) return E_POINTER; - *ppenumCatInfo = COMCAT_IEnumCATEGORYINFO_Construct(lcid); - if (*ppenumCatInfo == NULL) return E_OUTOFMEMORY; - IEnumCATEGORYINFO_AddRef(*ppenumCatInfo); - return S_OK; + return EnumCATEGORYINFO_Construct(lcid, ppenumCatInfo); } /********************************************************************** @@ -556,6 +553,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumClassesOfCategories( LPENUMCLSID *ppenumCLSID) { struct class_categories *categories; + HRESULT hr; TRACE("\n"); @@ -571,13 +569,15 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumClassesOfCategories( categories = COMCAT_PrepareClassCategories(cImplemented, rgcatidImpl, cRequired, rgcatidReq); if (categories == NULL) return E_OUTOFMEMORY; - *ppenumCLSID = CLSIDEnumGUID_Construct(categories); - if (*ppenumCLSID == NULL) { + + hr = CLSIDEnumGUID_Construct(categories, ppenumCLSID); + if (FAILED(hr)) + { HeapFree(GetProcessHeap(), 0, categories); - return E_OUTOFMEMORY; + return hr; } - IEnumGUID_AddRef(*ppenumCLSID); - return S_OK; + + return hr; } /********************************************************************** @@ -644,9 +644,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumImplCategoriesOfClass( if (rclsid == NULL || ppenumCATID == NULL) return E_POINTER; - *ppenumCATID = CATIDEnumGUID_Construct(rclsid, postfix); - if (*ppenumCATID == NULL) return E_OUTOFMEMORY; - return S_OK; + return CATIDEnumGUID_Construct(rclsid, postfix, ppenumCATID); } /********************************************************************** @@ -666,9 +664,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumReqCategoriesOfClass( if (rclsid == NULL || ppenumCATID == NULL) return E_POINTER; - *ppenumCATID = CATIDEnumGUID_Construct(rclsid, postfix); - if (*ppenumCATID == NULL) return E_OUTOFMEMORY; - return S_OK; + return CATIDEnumGUID_Construct(rclsid, postfix, ppenumCATID); } /********************************************************************** @@ -970,21 +966,23 @@ static const IEnumCATEGORYINFOVtbl COMCAT_IEnumCATEGORYINFO_Vtbl = COMCAT_IEnumCATEGORYINFO_Clone }; -static IEnumCATEGORYINFO *COMCAT_IEnumCATEGORYINFO_Construct(LCID lcid) +static HRESULT EnumCATEGORYINFO_Construct(LCID lcid, IEnumCATEGORYINFO **ret) { + static const WCHAR keyname[] = {'C','o','m','p','o','n','e','n','t',' ','C','a','t','e','g','o','r','i','e','s',0}; IEnumCATEGORYINFOImpl *This; + *ret = NULL; + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IEnumCATEGORYINFOImpl)); - if (This) { - static const WCHAR keyname[] = { 'C', 'o', 'm', 'p', 'o', 'n', 'e', 'n', - 't', ' ', 'C', 'a', 't', 'e', 'g', 'o', - 'r', 'i', 'e', 's', 0 }; - - This->IEnumCATEGORYINFO_iface.lpVtbl = &COMCAT_IEnumCATEGORYINFO_Vtbl; - This->lcid = lcid; - open_classes_key(HKEY_CLASSES_ROOT, keyname, KEY_READ, &This->key); - } - return &This->IEnumCATEGORYINFO_iface; + if (!This) return E_OUTOFMEMORY; + + This->IEnumCATEGORYINFO_iface.lpVtbl = &COMCAT_IEnumCATEGORYINFO_Vtbl; + This->ref = 1; + This->lcid = lcid; + open_classes_key(HKEY_CLASSES_ROOT, keyname, KEY_READ, &This->key); + + *ret = &This->IEnumCATEGORYINFO_iface; + return S_OK; } /********************************************************************** @@ -1164,19 +1162,24 @@ static const IEnumGUIDVtbl CLSIDEnumGUIDVtbl = CLSIDEnumGUID_Clone }; -static IEnumGUID* CLSIDEnumGUID_Construct(struct class_categories *categories) +static HRESULT CLSIDEnumGUID_Construct(struct class_categories *categories, IEnumCLSID **ret) { + static const WCHAR keyname[] = {'C','L','S','I','D',0}; CLSID_IEnumGUIDImpl *This; + *ret = NULL; + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CLSID_IEnumGUIDImpl)); - if (This) { - static const WCHAR keyname[] = { 'C', 'L', 'S', 'I', 'D', 0 }; + if (!This) return E_OUTOFMEMORY; - This->IEnumGUID_iface.lpVtbl = &CLSIDEnumGUIDVtbl; - This->categories = categories; - open_classes_key(HKEY_CLASSES_ROOT, keyname, KEY_READ, &This->key); - } - return &This->IEnumGUID_iface; + This->IEnumGUID_iface.lpVtbl = &CLSIDEnumGUIDVtbl; + This->ref = 1; + This->categories = categories; + open_classes_key(HKEY_CLASSES_ROOT, keyname, KEY_READ, &This->key); + + *ret = &This->IEnumGUID_iface; + + return S_OK; } /********************************************************************** @@ -1337,20 +1340,30 @@ static const IEnumGUIDVtbl CATIDEnumGUIDVtbl = CATIDEnumGUID_Clone }; -static IEnumGUID* CATIDEnumGUID_Construct( - REFCLSID rclsid, LPCWSTR postfix) +static HRESULT CATIDEnumGUID_Construct(REFCLSID rclsid, LPCWSTR postfix, IEnumGUID **ret) { + static const WCHAR prefixW[] = {'C','L','S','I','D','\\',0}; + WCHAR keyname[100], clsidW[CHARS_IN_GUID]; CATID_IEnumGUIDImpl *This; This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CATID_IEnumGUIDImpl)); - if (This) { - WCHAR prefix[] = { 'C', 'L', 'S', 'I', 'D', '\\' }; - - This->IEnumGUID_iface.lpVtbl = &CATIDEnumGUIDVtbl; - memcpy(This->keyname, prefix, sizeof(prefix)); - StringFromGUID2(rclsid, This->keyname + 6, CHARS_IN_GUID); - lstrcpyW(This->keyname + 44, postfix); - open_classes_key(HKEY_CLASSES_ROOT, This->keyname, KEY_READ, &This->key); - } - return &This->IEnumGUID_iface; + if (!This) return E_OUTOFMEMORY; + + *ret = NULL; + + This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CATID_IEnumGUIDImpl)); + if (!This) return E_OUTOFMEMORY; + + StringFromGUID2(rclsid, clsidW, CHARS_IN_GUID); + + This->IEnumGUID_iface.lpVtbl = &CATIDEnumGUIDVtbl; + This->ref = 1; + strcpyW(keyname, prefixW); + strcatW(keyname, clsidW); + strcatW(keyname, postfix); + + open_classes_key(HKEY_CLASSES_ROOT, keyname, KEY_READ, &This->key); + + *ret = &This->IEnumGUID_iface; + return S_OK; }

1 0

Henri Verbeet : wined3d: Pass a wined3d_resource_desc structure to volume_init().
by Alexandre Julliard Dec. 6, 2013

Dec. 6, 2013

Module: wine Branch: master Commit: 5db26f7b457d076b340589e68a44c20c8576e455 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db26f7b457d076b340589e68… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 6 11:09:54 2013 +0100 wined3d: Pass a wined3d_resource_desc structure to volume_init(). --- dlls/wined3d/texture.c | 17 +++++++---------- dlls/wined3d/volume.c | 37 ++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 3 +-- 3 files changed, 24 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a5117e5..e9d9b8b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1021,7 +1021,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct UINT levels, struct wined3d_device *device, void *parent, const struct wined3d_parent_ops *parent_ops) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - UINT tmp_w, tmp_h, tmp_d; + struct wined3d_resource_desc volume_desc; unsigned int i; HRESULT hr; @@ -1104,16 +1104,13 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct texture->target = GL_TEXTURE_3D; /* Generate all the surfaces. */ - tmp_w = desc->width; - tmp_h = desc->height; - tmp_d = desc->depth; - + volume_desc = *desc; + volume_desc.resource_type = WINED3D_RTYPE_VOLUME; for (i = 0; i < texture->level_count; ++i) { struct wined3d_volume *volume; - if (FAILED(hr = wined3d_volume_create(device, parent, tmp_w, tmp_h, tmp_d, i, - desc->format, desc->usage, desc->pool, &volume))) + if (FAILED(hr = wined3d_volume_create(device, parent, &volume_desc, i, &volume))) { ERR("Creating a volume for the volume texture failed, hr %#x.\n", hr); wined3d_texture_cleanup(texture); @@ -1125,9 +1122,9 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct texture->sub_resources[i] = &volume->resource; /* Calculate the next mipmap level. */ - tmp_w = max(1, tmp_w >> 1); - tmp_h = max(1, tmp_h >> 1); - tmp_d = max(1, tmp_d >> 1); + volume_desc.width = max(1, volume_desc.width >> 1); + volume_desc.height = max(1, volume_desc.height >> 1); + volume_desc.depth = max(1, volume_desc.depth >> 1); } return WINED3D_OK; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 512d1bd..b981374 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -812,11 +812,11 @@ static const struct wined3d_resource_ops volume_resource_ops = volume_unload, }; -static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device *device, UINT width, UINT height, - UINT depth, UINT level, DWORD usage, enum wined3d_format_id format_id, enum wined3d_pool pool) +static HRESULT volume_init(struct wined3d_volume *volume, const struct wined3d_resource_desc *desc, + struct wined3d_device *device, UINT level) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - const struct wined3d_format *format = wined3d_get_format(gl_info, format_id); + const struct wined3d_format *format = wined3d_get_format(gl_info, desc->format); HRESULT hr; UINT size; @@ -827,17 +827,17 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device } /* TODO: Write tests for other resources and move this check * to resource_init, if applicable. */ - if (usage & WINED3DUSAGE_DYNAMIC - && (pool == WINED3D_POOL_MANAGED || pool == WINED3D_POOL_SCRATCH)) + if (desc->usage & WINED3DUSAGE_DYNAMIC + && (desc->pool == WINED3D_POOL_MANAGED || desc->pool == WINED3D_POOL_SCRATCH)) { - WARN("Attempted to create a DYNAMIC texture in pool %u.\n", pool); + WARN("Attempted to create a DYNAMIC texture in pool %s.\n", debug_d3dpool(desc->pool)); return WINED3DERR_INVALIDCALL; } - size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, depth); + size = wined3d_format_calculate_size(format, device->surface_alignment, desc->width, desc->height, desc->depth); if (FAILED(hr = resource_init(&volume->resource, device, WINED3D_RTYPE_VOLUME, format, - WINED3D_MULTISAMPLE_NONE, 0, usage, pool, width, height, depth, + WINED3D_MULTISAMPLE_NONE, 0, desc->usage, desc->pool, desc->width, desc->height, desc->depth, size, NULL, &wined3d_null_parent_ops, &volume_resource_ops))) { WARN("Failed to initialize resource, returning %#x.\n", hr); @@ -847,7 +847,7 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device volume->texture_level = level; volume->locations = WINED3D_LOCATION_DISCARDED; - if (pool == WINED3D_POOL_DEFAULT && usage & WINED3DUSAGE_DYNAMIC + if (desc->pool == WINED3D_POOL_DEFAULT && desc->usage & WINED3DUSAGE_DYNAMIC && gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && !format->convert) { @@ -858,9 +858,8 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device return WINED3D_OK; } -HRESULT CDECL wined3d_volume_create(struct wined3d_device *device, void *container_parent, - UINT width, UINT height, UINT depth, UINT level, enum wined3d_format_id format_id, - DWORD usage, enum wined3d_pool pool, struct wined3d_volume **volume) +HRESULT wined3d_volume_create(struct wined3d_device *device, void *container_parent, + const struct wined3d_resource_desc *desc, unsigned int level, struct wined3d_volume **volume) { const struct wined3d_parent_ops *parent_ops; struct wined3d_volume *object; @@ -869,17 +868,13 @@ HRESULT CDECL wined3d_volume_create(struct wined3d_device *device, void *contain TRACE("device %p, container_parent %p, width %u, height %u, depth %u, level %u, format %s, " "usage %#x, pool %s, volume %p.\n", - device, container_parent, width, height, depth, level, debug_d3dformat(format_id), - usage, debug_d3dpool(pool), volume); + device, container_parent, desc->width, desc->height, desc->depth, level, debug_d3dformat(desc->format), + desc->usage, debug_d3dpool(desc->pool), volume); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - { - *volume = NULL; - return WINED3DERR_OUTOFVIDEOMEMORY; - } + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; - if (FAILED(hr = volume_init(object, device, width, height, depth, level, usage, format_id, pool))) + if (FAILED(hr = volume_init(object, desc, device, level))) { WARN("Failed to initialize volume, returning %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e13e301..b011a69 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2134,8 +2134,7 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc } HRESULT wined3d_volume_create(struct wined3d_device *device, void *container_parent, - UINT width, UINT height, UINT depth, UINT level, enum wined3d_format_id format_id, - DWORD usage, enum wined3d_pool pool, struct wined3d_volume **volume); + const struct wined3d_resource_desc *desc, unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN; void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Set the volume container in volume_init().
by Alexandre Julliard Dec. 6, 2013

Dec. 6, 2013

Module: wine Branch: master Commit: 36dbac6cb83141a9db334ccf18f8d470ae3ea225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36dbac6cb83141a9db334ccf1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 6 11:09:55 2013 +0100 wined3d: Set the volume container in volume_init(). --- dlls/wined3d/texture.c | 4 +--- dlls/wined3d/volume.c | 23 ++++++++++++++--------- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e9d9b8b..31eb2b0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1110,15 +1110,13 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct { struct wined3d_volume *volume; - if (FAILED(hr = wined3d_volume_create(device, parent, &volume_desc, i, &volume))) + if (FAILED(hr = wined3d_volume_create(texture, &volume_desc, i, &volume))) { ERR("Creating a volume for the volume texture failed, hr %#x.\n", hr); wined3d_texture_cleanup(texture); return hr; } - /* Set its container to this texture. */ - volume_set_container(volume, texture); texture->sub_resources[i] = &volume->resource; /* Calculate the next mipmap level. */ diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index b981374..817fe7e 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -812,9 +812,10 @@ static const struct wined3d_resource_ops volume_resource_ops = volume_unload, }; -static HRESULT volume_init(struct wined3d_volume *volume, const struct wined3d_resource_desc *desc, - struct wined3d_device *device, UINT level) +static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_texture *container, + const struct wined3d_resource_desc *desc, UINT level) { + struct wined3d_device *device = container->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, desc->format); HRESULT hr; @@ -855,36 +856,40 @@ static HRESULT volume_init(struct wined3d_volume *volume, const struct wined3d_r volume->flags |= WINED3D_VFLAG_PBO; } + volume_set_container(volume, container); + return WINED3D_OK; } -HRESULT wined3d_volume_create(struct wined3d_device *device, void *container_parent, - const struct wined3d_resource_desc *desc, unsigned int level, struct wined3d_volume **volume) +HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, + unsigned int level, struct wined3d_volume **volume) { + struct wined3d_device_parent *device_parent = container->resource.device->device_parent; const struct wined3d_parent_ops *parent_ops; struct wined3d_volume *object; void *parent; HRESULT hr; - TRACE("device %p, container_parent %p, width %u, height %u, depth %u, level %u, format %s, " + TRACE("container %p, width %u, height %u, depth %u, level %u, format %s, " "usage %#x, pool %s, volume %p.\n", - device, container_parent, desc->width, desc->height, desc->depth, level, debug_d3dformat(desc->format), + container, desc->width, desc->height, desc->depth, level, debug_d3dformat(desc->format), desc->usage, debug_d3dpool(desc->pool), volume); if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) return E_OUTOFMEMORY; - if (FAILED(hr = volume_init(object, desc, device, level))) + if (FAILED(hr = volume_init(object, container, desc, level))) { WARN("Failed to initialize volume, returning %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); return hr; } - if (FAILED(hr = device->device_parent->ops->volume_created(device->device_parent, - container_parent, object, &parent, &parent_ops))) + if (FAILED(hr = device_parent->ops->volume_created(device_parent, + wined3d_texture_get_parent(container), object, &parent, &parent_ops))) { WARN("Failed to create volume parent, hr %#x.\n", hr); + volume_set_container(object, NULL); wined3d_volume_decref(object); return hr; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b011a69..ad9b347 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2133,8 +2133,8 @@ static inline struct wined3d_volume *volume_from_resource(struct wined3d_resourc return CONTAINING_RECORD(resource, struct wined3d_volume, resource); } -HRESULT wined3d_volume_create(struct wined3d_device *device, void *container_parent, - const struct wined3d_resource_desc *desc, unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN; +HRESULT wined3d_volume_create(struct wined3d_texture *container, const struct wined3d_resource_desc *desc, + unsigned int level, struct wined3d_volume **volume) DECLSPEC_HIDDEN; void wined3d_volume_load(struct wined3d_volume *volume, struct wined3d_context *context, BOOL srgb_mode) DECLSPEC_HIDDEN; void volume_set_container(struct wined3d_volume *volume, struct wined3d_texture *container) DECLSPEC_HIDDEN;

1 0

Huw Davies : riched20: Remove some over-zealous calls to clear the insert style.
by Alexandre Julliard Dec. 6, 2013

Dec. 6, 2013

Module: wine Branch: master Commit: f13fe24e9e3aef3c194fbba10a2396d979e585e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f13fe24e9e3aef3c194fbba10… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 6 11:51:23 2013 +0000 riched20: Remove some over-zealous calls to clear the insert style. It's cleared correctly, if the selection actually changes, in the selection change notification handler. --- dlls/riched20/caret.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index fd7034d..33ea532 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -128,7 +128,6 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) ME_SetCursorToStart(editor, &editor->pCursors[1]); ME_SetCursorToEnd(editor, &editor->pCursors[0]); ME_InvalidateSelection(editor); - ME_ClearTempStyle(editor); return len + 1; } @@ -151,7 +150,6 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) editor->pCursors[1] = editor->pCursors[0]; ME_Repaint(editor); } - ME_ClearTempStyle(editor); return end; } @@ -180,7 +178,6 @@ int ME_SetSelection(ME_TextEditor *editor, int from, int to) ME_SetCursorToEnd(editor, &editor->pCursors[0]); editor->pCursors[1] = editor->pCursors[0]; ME_InvalidateSelection(editor); - ME_ClearTempStyle(editor); return len; } @@ -1132,7 +1129,6 @@ void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) ME_InvalidateSelection(editor); ITextHost_TxShowCaret(editor->texthost, FALSE); ME_ShowCaret(editor); - ME_ClearTempStyle(editor); ME_SendSelChange(editor); }

1 0

Andrey Gusev : po: Small Ukrainian translation fix.
by Alexandre Julliard Dec. 6, 2013

Dec. 6, 2013

Module: wine Branch: master Commit: 68f094b73472e9a036e71ad3bb5be26cde74e0ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f094b73472e9a036e71ad3b… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Dec 6 18:36:02 2013 +0200 po: Small Ukrainian translation fix. --- po/uk.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/uk.po b/po/uk.po index d0fe2f0..bbb04c0 100644 --- a/po/uk.po +++ b/po/uk.po @@ -13928,7 +13928,7 @@ msgstr "&Формат символів" #: wordpad.rc:64 msgid "&Def. char format" -msgstr "Формат символів за &замовч." +msgstr "Формат символів &за замовч." #: wordpad.rc:65 msgid "Paragrap&h format"

1 0

Nikolay Bogoychev : wined3d: Recognize Haswell mobile graphics 4600.
by Alexandre Julliard Dec. 6, 2013

Dec. 6, 2013

Module: wine Branch: master Commit: 48de52e2e0bb1156c1caa2dfea2ae5de3da09a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48de52e2e0bb1156c1caa2dfe… Author: Nikolay Bogoychev <nheart(a)gmail.com> Date: Thu Dec 5 17:45:27 2013 +0000 wined3d: Recognize Haswell mobile graphics 4600. --- dlls/wined3d/directx.c | 3 +++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f26a29d..bd0cddc 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1330,6 +1330,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IVBD, "Intel(R) Ivybridge Desktop", DRIVER_INTEL_GMA3000, 1024}, {HW_VENDOR_INTEL, CARD_INTEL_IVBM, "Intel(R) Ivybridge Mobile", DRIVER_INTEL_GMA3000, 1024}, {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) Ivybridge Server", DRIVER_INTEL_GMA3000, 1024}, + {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) Haswell Mobile", DRIVER_INTEL_GMA3000, 1024}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, @@ -1991,6 +1992,8 @@ static enum wined3d_pci_device select_card_intel(const struct wined3d_gl_info *g } cards[] = { + /* Haswell */ + {"Haswell Mobile", CARD_INTEL_HWM}, /* Ivybridge */ {"Ivybridge Server", CARD_INTEL_IVBS}, {"Ivybridge Mobile", CARD_INTEL_IVBM}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ad9b347..f6a6cf4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1505,6 +1505,7 @@ enum wined3d_pci_device CARD_INTEL_IVBD = 0x0162, CARD_INTEL_IVBM = 0x0166, CARD_INTEL_IVBS = 0x015a, + CARD_INTEL_HWM = 0x0416, }; struct wined3d_fbo_ops

1 0