December 2013 - Wine-commits

Henri Verbeet : wined3d: Print the WINED3D_SWAP_EFFECT_FLIP FIXME only once .
by Alexandre Julliard 06 Dec '13

06 Dec '13

Module: wine Branch: master Commit: 660bc8b7171f7fbc88a5f65d3b535ce6a7168ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=660bc8b7171f7fbc88a5f65d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 6 11:09:56 2013 +0100 wined3d: Print the WINED3D_SWAP_EFFECT_FLIP FIXME only once. The comment is also outdated. --- dlls/wined3d/swapchain.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3d5aef7..6675c35 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -510,14 +510,10 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT if (swapchain->render_to_fbo) { - /* This codepath should only be hit with the COPY swapeffect. Otherwise a backbuffer- - * window size mismatch is impossible(fullscreen) and src and dst rectangles are - * not allowed(they need the COPY swapeffect) - * - * The DISCARD swap effect is ok as well since any backbuffer content is allowed after - * the swap. */ - if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP) - FIXME("Render-to-fbo with WINED3D_SWAP_EFFECT_FLIP\n"); + static unsigned int once; + + if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_FLIP && !once++) + FIXME("WINED3D_SWAP_EFFECT_FLIP not implemented.\n"); swapchain_blit(swapchain, context, &src_rect, &dst_rect); }

1 0

Huw Davies : riched20: Move the various selection setting methods to a common function.
by Alexandre Julliard 06 Dec '13

06 Dec '13

Module: wine Branch: master Commit: 160f65f24afb2cc0bd2e9482d077382a3e56c56f URL: http://source.winehq.org/git/wine.git/?a=commit;h=160f65f24afb2cc0bd2e9482d… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 6 11:51:22 2013 +0000 riched20: Move the various selection setting methods to a common function. --- dlls/riched20/editor.c | 37 +++++++++++++++++++------------------ 1 files changed, 19 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index b82b543..66dec2d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2016,6 +2016,22 @@ static int ME_GetTextRange(ME_TextEditor *editor, WCHAR *strText, } } +static int handle_EM_EXSETSEL( ME_TextEditor *editor, int to, int from ) +{ + int end; + + TRACE("%d - %d\n", to, from ); + + ME_InvalidateSelection( editor ); + end = ME_SetSelection( editor, to, from ); + ME_InvalidateSelection( editor ); + ITextHost_TxShowCaret( editor->texthost, FALSE ); + ME_ShowCaret( editor ); + ME_SendSelChange( editor ); + + return end; +} + typedef struct tagME_GlobalDestStruct { HGLOBAL hData; @@ -2383,7 +2399,7 @@ ME_KeyDown(ME_TextEditor *editor, WORD nKey) case 'A': if (ctrl_is_down) { - ME_SetSelection(editor, 0, -1); + handle_EM_EXSETSEL( editor, 0, -1 ); return TRUE; } break; @@ -3246,12 +3262,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_SETSEL: { - ME_InvalidateSelection(editor); - ME_SetSelection(editor, wParam, lParam); - ME_InvalidateSelection(editor); - ITextHost_TxShowCaret(editor->texthost, FALSE); - ME_ShowCaret(editor); - ME_SendSelChange(editor); + handle_EM_EXSETSEL( editor, wParam, lParam ); return 0; } case EM_SETSCROLLPOS: @@ -3275,19 +3286,9 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } case EM_EXSETSEL: { - int end; CHARRANGE range = *(CHARRANGE *)lParam; - TRACE("EM_EXSETSEL (%d,%d)\n", range.cpMin, range.cpMax); - - ME_InvalidateSelection(editor); - end = ME_SetSelection(editor, range.cpMin, range.cpMax); - ME_InvalidateSelection(editor); - ITextHost_TxShowCaret(editor->texthost, FALSE); - ME_ShowCaret(editor); - ME_SendSelChange(editor); - - return end; + return handle_EM_EXSETSEL( editor, range.cpMin, range.cpMax ); } case EM_SHOWSCROLLBAR: {

1 0

Huw Davies : riched20: Remove some over-zealous calls to clear the insert style.
by Alexandre Julliard 06 Dec '13

06 Dec '13

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

Nikolay Sivov : ole32: COM cleanup of IEnumGUID implementations.
by Alexandre Julliard 06 Dec '13

06 Dec '13

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 06 Dec '13

06 Dec '13

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 06 Dec '13

06 Dec '13

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 06 Dec '13

06 Dec '13

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

Nikolay Bogoychev : wined3d: Recognize Haswell mobile graphics 4600.
by Alexandre Julliard 06 Dec '13

06 Dec '13

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

Nikolay Bogoychev : wined3d: Recognize GeForce GTX 765M.
by Alexandre Julliard 06 Dec '13

06 Dec '13

Module: wine Branch: master Commit: 34ad4c7014c63a4b4f96f94ba4973831b97be2e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ad4c7014c63a4b4f96f94ba… Author: Nikolay Bogoychev <nheart(a)gmail.com> Date: Thu Dec 5 17:45:28 2013 +0000 wined3d: Recognize GeForce GTX 765M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index bd0cddc..ce08a61 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1258,6 +1258,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670, "NVIDIA GeForce GTX 670", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX670MX, "NVIDIA GeForce GTX 670MX", DRIVER_NVIDIA_GEFORCE6, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX680, "NVIDIA GeForce GTX 680", DRIVER_NVIDIA_GEFORCE6, 2048}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX765M, "NVIDIA GeForce GTX 765M", DRIVER_NVIDIA_GEFORCE6, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770M, "NVIDIA GeForce GTX 770M", DRIVER_NVIDIA_GEFORCE6, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX770, "NVIDIA GeForce GTX 770", DRIVER_NVIDIA_GEFORCE6, 2048}, @@ -1665,6 +1666,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl { {"GTX 770M", CARD_NVIDIA_GEFORCE_GTX770M}, /* Geforce 700 - midend high mobile */ {"GTX 770", CARD_NVIDIA_GEFORCE_GTX770}, /* Geforce 700 - highend */ + {"GTX 765M", CARD_NVIDIA_GEFORCE_GTX765M}, /* Geforce 700 - midend high mobile */ {"GTX 680", CARD_NVIDIA_GEFORCE_GTX680}, /* Geforce 600 - highend */ {"GTX 670MX", CARD_NVIDIA_GEFORCE_GTX670MX}, /* Geforce 600 - highend */ {"GTX 670", CARD_NVIDIA_GEFORCE_GTX670}, /* Geforce 600 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f6a6cf4..ea0637b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1468,6 +1468,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX670 = 0x1189, CARD_NVIDIA_GEFORCE_GTX670MX = 0x11a1, CARD_NVIDIA_GEFORCE_GTX680 = 0x1180, + CARD_NVIDIA_GEFORCE_GTX765M = 0x11e2, CARD_NVIDIA_GEFORCE_GTX770M = 0x11e0, CARD_NVIDIA_GEFORCE_GTX770 = 0x1184,

1 0

Henri Verbeet : ddraw: Properly swap the wined3d texture parent in ddraw_surface7_Flip().
by Alexandre Julliard 06 Dec '13

06 Dec '13

Module: wine Branch: master Commit: 0f49ffae41f6af847102b93d9acbe1d2abd5d3d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f49ffae41f6af847102b93d9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 6 16:38:10 2013 +0100 ddraw: Properly swap the wined3d texture parent in ddraw_surface7_Flip(). --- dlls/ddraw/surface.c | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0675294..78746ac 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1174,6 +1174,7 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra { struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface); struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src); + struct ddraw_texture *ddraw_texture, *prev_ddraw_texture; DDSCAPS2 caps = {DDSCAPS_FLIP, 0, 0, 0}; struct wined3d_surface *tmp, *rt; struct wined3d_texture *texture; @@ -1190,6 +1191,7 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra tmp = dst_impl->wined3d_surface; texture = dst_impl->wined3d_texture; rt = wined3d_device_get_render_target(dst_impl->ddraw->wined3d_device, 0); + ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture); if (src_impl) { @@ -1214,9 +1216,10 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra wined3d_device_set_render_target(dst_impl->ddraw->wined3d_device, 0, src_impl->wined3d_surface, FALSE); wined3d_resource_set_parent(wined3d_surface_get_resource(src_impl->wined3d_surface), dst_impl); dst_impl->wined3d_surface = src_impl->wined3d_surface; - wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), - wined3d_texture_get_parent(dst_impl->wined3d_texture)); + prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); + wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); dst_impl->wined3d_texture = src_impl->wined3d_texture; + ddraw_texture = prev_ddraw_texture; } else { @@ -1240,8 +1243,9 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra wined3d_device_set_render_target(dst_impl->ddraw->wined3d_device, 0, src_impl->wined3d_surface, FALSE); wined3d_resource_set_parent(wined3d_surface_get_resource(src_impl->wined3d_surface), dst_impl); dst_impl->wined3d_surface = src_impl->wined3d_surface; - wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), - wined3d_texture_get_parent(dst_impl->wined3d_texture)); + prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); + wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); + ddraw_texture = prev_ddraw_texture; dst_impl->wined3d_texture = src_impl->wined3d_texture; dst_impl = src_impl; } @@ -1253,8 +1257,7 @@ static HRESULT WINAPI ddraw_surface7_Flip(IDirectDrawSurface7 *iface, IDirectDra wined3d_device_set_render_target(dst_impl->ddraw->wined3d_device, 0, tmp, FALSE); wined3d_resource_set_parent(wined3d_surface_get_resource(tmp), src_impl); src_impl->wined3d_surface = tmp; - wined3d_resource_set_parent(wined3d_texture_get_resource(texture), - wined3d_texture_get_parent(src_impl->wined3d_texture)); + wined3d_resource_set_parent(wined3d_texture_get_resource(texture), ddraw_texture); src_impl->wined3d_texture = texture; if (flags)

1 0