February 2015 - Wine-commits

Ken Thomases : winemac: When Cocoa brings a window forward, tell Wine even if it's disabled or no-activate.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: 2b97f8c1d195fdef9a76373b2821ac986662d54b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b97f8c1d195fdef9a76373b2… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 29 16:48:41 2015 -0600 winemac: When Cocoa brings a window forward, tell Wine even if it's disabled or no-activate. We can't prevent Cocoa from bringing disabled/no-activate windows forward. So, we need to tell Wine about the z-order change. We still do avoid telling Wine to activate disabled/no-activate windows, though. --- dlls/winemac.drv/cocoa_app.m | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 7d61120..1196987 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1587,7 +1587,6 @@ int macdrv_err_on; BOOL broughtWindowForward = FALSE; if ([window isKindOfClass:[WineWindow class]] && - !window.disabled && !window.noActivate && type == NSLeftMouseDown && (([theEvent modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask)) { @@ -1693,7 +1692,7 @@ int macdrv_err_on; else if (broughtWindowForward) { [[window ancestorWineWindow] postBroughtForwardEvent]; - if (![window isKeyWindow]) + if (![window isKeyWindow] && !window.disabled && !window.noActivate) [self windowGotFocus:window]; } }

1 0

Ken Thomases : winemac: Track which window was brought forward by Cocoa separately from the window receiving the click event.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: 5fe3c4b89e0676aa0442a0f3dbde82977881db4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fe3c4b89e0676aa0442a0f3d… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 29 16:49:01 2015 -0600 winemac: Track which window was brought forward by Cocoa separately from the window receiving the click event. If the mouse is captured, we change which window receives the click event, but that shouldn't change which window we tell Wine was brought forward by Cocoa. --- dlls/winemac.drv/cocoa_app.m | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 1196987..119de2a 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1584,7 +1584,7 @@ int macdrv_err_on; { WineWindow* window = (WineWindow*)[theEvent window]; NSEventType type = [theEvent type]; - BOOL broughtWindowForward = FALSE; + WineWindow* windowBroughtForward = nil; if ([window isKindOfClass:[WineWindow class]] && type == NSLeftMouseDown && @@ -1592,7 +1592,7 @@ int macdrv_err_on; { NSWindowButton windowButton; - broughtWindowForward = TRUE; + windowBroughtForward = window; /* Any left-click on our window anyplace other than the close or minimize buttons will bring it forward. */ @@ -1606,7 +1606,7 @@ int macdrv_err_on; NSPoint point = [button convertPoint:[theEvent locationInWindow] fromView:nil]; if ([button mouse:point inRect:[button bounds]]) { - broughtWindowForward = FALSE; + windowBroughtForward = nil; break; } } @@ -1689,11 +1689,11 @@ int macdrv_err_on; macdrv_release_event(event); } - else if (broughtWindowForward) + else if (windowBroughtForward) { - [[window ancestorWineWindow] postBroughtForwardEvent]; - if (![window isKeyWindow] && !window.disabled && !window.noActivate) - [self windowGotFocus:window]; + [[windowBroughtForward ancestorWineWindow] postBroughtForwardEvent]; + if (![windowBroughtForward isKeyWindow] && !windowBroughtForward.disabled && !windowBroughtForward.noActivate) + [self windowGotFocus:windowBroughtForward]; } }

1 0

Ken Thomases : winemac: Tell Wine that Cocoa brought a window forward even if a window is being dragged.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: 8ec1b4f010952bfee423c66c9b6b5a7e248814d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ec1b4f010952bfee423c66c9… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 29 16:49:30 2015 -0600 winemac: Tell Wine that Cocoa brought a window forward even if a window is being dragged. When a window is being dragged, we prevent delivery of clicks to Wine. We were also preventing telling Wine that a window had been brought forward, but this was incorrect. It prevented clicks in the title bar from activating the window. --- dlls/winemac.drv/cocoa_app.m | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 119de2a..5afb7f8 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1585,6 +1585,7 @@ int macdrv_err_on; WineWindow* window = (WineWindow*)[theEvent window]; NSEventType type = [theEvent type]; WineWindow* windowBroughtForward = nil; + BOOL process = FALSE; if ([window isKindOfClass:[WineWindow class]] && type == NSLeftMouseDown && @@ -1622,7 +1623,6 @@ int macdrv_err_on; { BOOL pressed = (type == NSLeftMouseDown || type == NSRightMouseDown || type == NSOtherMouseDown); CGPoint pt = CGEventGetLocation([theEvent CGEvent]); - BOOL process; if (clippingCursor) [self clipCursorLocation:&pt]; @@ -1689,12 +1689,13 @@ int macdrv_err_on; macdrv_release_event(event); } - else if (windowBroughtForward) - { - [[windowBroughtForward ancestorWineWindow] postBroughtForwardEvent]; - if (![windowBroughtForward isKeyWindow] && !windowBroughtForward.disabled && !windowBroughtForward.noActivate) - [self windowGotFocus:windowBroughtForward]; - } + } + + if (!process && windowBroughtForward) + { + [[windowBroughtForward ancestorWineWindow] postBroughtForwardEvent]; + if (![windowBroughtForward isKeyWindow] && !windowBroughtForward.disabled && !windowBroughtForward.noActivate) + [self windowGotFocus:windowBroughtForward]; } // Since mouse button events deliver absolute cursor position, the

1 0

Charles Davis : winemac.drv: Always initialize a closure-captured object pointer.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: a872c21a48ddb6ba876eb906b65e6393c1be869d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a872c21a48ddb6ba876eb906b… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Thu Jan 29 16:23:25 2015 -0700 winemac.drv: Always initialize a closure-captured object pointer. --- dlls/winemac.drv/cocoa_event.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/cocoa_event.m b/dlls/winemac.drv/cocoa_event.m index 757ad6b..c011f8d 100644 --- a/dlls/winemac.drv/cocoa_event.m +++ b/dlls/winemac.drv/cocoa_event.m @@ -470,7 +470,7 @@ void OnMainThread(dispatch_block_t block) NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; NSMutableDictionary* threadDict = [[NSThread currentThread] threadDictionary]; WineEventQueue* queue = [threadDict objectForKey:WineEventQueueThreadDictionaryKey]; - dispatch_semaphore_t semaphore; + dispatch_semaphore_t semaphore = NULL; __block BOOL finished; if (!queue)

1 0

Piotr Caban : shell32: Create trash test file in temp directory.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: 814ab9ee4635c73e88e27960d30ad023a4d9121c URL: http://source.winehq.org/git/wine.git/?a=commit;h=814ab9ee4635c73e88e27960d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 30 17:03:25 2015 +0100 shell32: Create trash test file in temp directory. --- dlls/shell32/tests/recyclebin.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/tests/recyclebin.c b/dlls/shell32/tests/recyclebin.c index d449b7e..c798492 100644 --- a/dlls/shell32/tests/recyclebin.c +++ b/dlls/shell32/tests/recyclebin.c @@ -55,8 +55,7 @@ static void test_query_recyclebin(void) HRESULT hr; HANDLE file; SHFILEOPSTRUCTA shfo; - const CHAR name[] = "test.txt"; - CHAR buf[MAX_PATH + sizeof(name) + 1]; + CHAR temp_path[MAX_PATH-14], buf[MAX_PATH+1]; if(!pSHQueryRecycleBinA) { skip("SHQueryRecycleBinA does not exist\n"); @@ -67,18 +66,17 @@ static void test_query_recyclebin(void) skip("SHFileOperationA does not exist\n"); return; } - GetCurrentDirectoryA(MAX_PATH, buf); - strcat(buf,"\\"); - strcat(buf,name); + ok(GetTempPathA(sizeof(temp_path), temp_path), "GetTempPath failed\n"); + ok(GetTempFileNameA(temp_path, "trash", 0, buf), "GetTempFileName failed\n"); buf[strlen(buf) + 1] = '\0'; hr = pSHQueryRecycleBinA(buf,&info1); ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); ok(info1.i64Size!=0xdeadbeef,"i64Size not set\n"); ok(info1.i64NumItems!=0xdeadbeef,"i64NumItems not set\n"); /*create and send a file to the recycle bin*/ - file = CreateFileA(name,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,0,NULL); - ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n",name); - WriteFile(file,name,strlen(name),&written,NULL); + file = CreateFileA(buf,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,0,NULL); + ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n",buf); + WriteFile(file,buf,strlen(buf),&written,NULL); CloseHandle(file); shfo.hwnd = NULL; shfo.wFunc = FO_DELETE;

1 0

Piotr Caban : shell32: Handle TRASH_EnumItems failures correctly.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: d46862b4874519d70a4138285a6b754e3e0c4c20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d46862b4874519d70a4138285… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 30 17:03:30 2015 +0100 shell32: Handle TRASH_EnumItems failures correctly. --- dlls/shell32/recyclebin.c | 15 ++++++++++++--- dlls/shell32/tests/recyclebin.c | 21 +++++++++++---------- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index d839329..7053998 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -411,7 +411,7 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH IEnumIDListImpl *list; LPITEMIDLIST *pidls; HRESULT ret = E_OUTOFMEMORY; - int pidls_count; + int pidls_count = 0; int i=0; TRACE("(%p, %p, %x, %p)\n", This, hwnd, grfFlags, ppenumIDList); @@ -860,10 +860,14 @@ HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR pszRootPath, LPSHQUERYRBINFO pSHQueryR LPITEMIDLIST *apidl; INT cidl; INT i=0; + HRESULT hr; + TRACE("(%s, %p)\n", debugstr_w(pszRootPath), pSHQueryRBInfo); FIXME("Ignoring pszRootPath=%s\n",debugstr_w(pszRootPath)); - TRASH_EnumItems(&apidl,&cidl); + hr = TRASH_EnumItems(&apidl,&cidl); + if (FAILED(hr)) + return hr; pSHQueryRBInfo->i64NumItems = cidl; pSHQueryRBInfo->i64Size = 0; for (; i<cidl; i++) @@ -894,9 +898,14 @@ HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags) INT cidl; INT i=0; HRESULT ret; + TRACE("(%p, %s, 0x%08x)\n", hwnd, debugstr_w(pszRootPath) , dwFlags); FIXME("Ignoring pszRootPath=%s\n",debugstr_w(pszRootPath)); - TRASH_EnumItems(&apidl,&cidl); + + ret = TRASH_EnumItems(&apidl,&cidl); + if (FAILED(ret)) + return ret; + ret = erase_items(hwnd,(const LPCITEMIDLIST*)apidl,cidl,!(dwFlags & SHERB_NOCONFIRMATION)); for (;i<cidl;i++) ILFree(apidl[i]); diff --git a/dlls/shell32/tests/recyclebin.c b/dlls/shell32/tests/recyclebin.c index c798492..ba99adf 100644 --- a/dlls/shell32/tests/recyclebin.c +++ b/dlls/shell32/tests/recyclebin.c @@ -70,9 +70,12 @@ static void test_query_recyclebin(void) ok(GetTempFileNameA(temp_path, "trash", 0, buf), "GetTempFileName failed\n"); buf[strlen(buf) + 1] = '\0'; hr = pSHQueryRecycleBinA(buf,&info1); - ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); - ok(info1.i64Size!=0xdeadbeef,"i64Size not set\n"); - ok(info1.i64NumItems!=0xdeadbeef,"i64NumItems not set\n"); + if(hr != S_OK) todo_wine ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); + else { + ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); + ok(info1.i64Size!=0xdeadbeef,"i64Size not set\n"); + ok(info1.i64NumItems!=0xdeadbeef,"i64NumItems not set\n"); + } /*create and send a file to the recycle bin*/ file = CreateFileA(buf,GENERIC_WRITE,0,NULL,CREATE_ALWAYS,0,NULL); ok(file != INVALID_HANDLE_VALUE, "Failure to open file %s\n",buf); @@ -87,13 +90,11 @@ static void test_query_recyclebin(void) shfo.lpszProgressTitle = NULL; ok(!pSHFileOperationA(&shfo), "Deletion was not successful\n"); hr = pSHQueryRecycleBinA(buf,&info2); - ok(hr == S_OK, "SHQueryRecycleBinW failed with error 0x%x\n", hr); - if(info2.i64Size!=info1.i64Size || info2.i64NumItems!=info1.i64NumItems) { - ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",str_from_int64(info1.i64Size+written)); - ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",str_from_int64(info1.i64NumItems+1)); - } else todo_wine { - ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",str_from_int64(info1.i64Size+written)); - ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",str_from_int64(info1.i64NumItems+1)); + if(hr != S_OK) todo_wine ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); + else { + ok(hr == S_OK, "SHQueryRecycleBinA failed with error 0x%x\n", hr); + ok(info2.i64Size==info1.i64Size+written,"Expected recycle bin to have 0x%s bytes\n",str_from_int64(info1.i64Size+written)); + ok(info2.i64NumItems==info1.i64NumItems+1,"Expected recycle bin to have 0x%s items\n",str_from_int64(info1.i64NumItems+1)); } }

1 0

Piotr Caban : shell32: Pass trash path to TRASH_EnumItems.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: 8aba9366edbafeada63105e000a101738338c91e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8aba9366edbafeada63105e00… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 30 17:03:36 2015 +0100 shell32: Pass trash path to TRASH_EnumItems. --- dlls/shell32/recyclebin.c | 8 +++----- dlls/shell32/trash.c | 7 +++++-- dlls/shell32/xdg.h | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/shell32/recyclebin.c b/dlls/shell32/recyclebin.c index 7053998..28098af 100644 --- a/dlls/shell32/recyclebin.c +++ b/dlls/shell32/recyclebin.c @@ -423,7 +423,7 @@ static HRESULT WINAPI RecycleBin_EnumObjects(IShellFolder2 *iface, HWND hwnd, SH if (grfFlags & SHCONTF_NONFOLDERS) { - if (FAILED(ret = TRASH_EnumItems(&pidls, &pidls_count))) + if (FAILED(ret = TRASH_EnumItems(NULL, &pidls, &pidls_count))) goto failed; for (i=0; i<pidls_count; i++) if (!AddToEnumList(list, pidls[i])) @@ -863,9 +863,8 @@ HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR pszRootPath, LPSHQUERYRBINFO pSHQueryR HRESULT hr; TRACE("(%s, %p)\n", debugstr_w(pszRootPath), pSHQueryRBInfo); - FIXME("Ignoring pszRootPath=%s\n",debugstr_w(pszRootPath)); - hr = TRASH_EnumItems(&apidl,&cidl); + hr = TRASH_EnumItems(pszRootPath, &apidl, &cidl); if (FAILED(hr)) return hr; pSHQueryRBInfo->i64NumItems = cidl; @@ -900,9 +899,8 @@ HRESULT WINAPI SHEmptyRecycleBinW(HWND hwnd, LPCWSTR pszRootPath, DWORD dwFlags) HRESULT ret; TRACE("(%p, %s, 0x%08x)\n", hwnd, debugstr_w(pszRootPath) , dwFlags); - FIXME("Ignoring pszRootPath=%s\n",debugstr_w(pszRootPath)); - ret = TRASH_EnumItems(&apidl,&cidl); + ret = TRASH_EnumItems(pszRootPath, &apidl, &cidl); if (FAILED(ret)) return ret; diff --git a/dlls/shell32/trash.c b/dlls/shell32/trash.c index 3ca6e4e..f178570 100644 --- a/dlls/shell32/trash.c +++ b/dlls/shell32/trash.c @@ -100,7 +100,7 @@ BOOL TRASH_TrashFile(LPCWSTR wszPath) return (status == noErr); } -HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count) +HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) { FIXME("stub!\n"); return E_NOTIMPL; @@ -577,12 +577,15 @@ failed: return NULL; } -HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count) +HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) { int ti_count; int pos=0, i; HRESULT err = E_OUTOFMEMORY; HDPA tinfs; + + if(path) + FIXME("Ignoring path = %s\n", debugstr_w(path)); if (!TRASH_EnsureInitialized()) return E_FAIL; tinfs = enum_bucket_trashinfos(home_trash, &ti_count); diff --git a/dlls/shell32/xdg.h b/dlls/shell32/xdg.h index 6236887..dc3acb0 100644 --- a/dlls/shell32/xdg.h +++ b/dlls/shell32/xdg.h @@ -40,7 +40,7 @@ void XDG_FreeParsedFile(XDG_PARSED_FILE *file) DECLSPEC_HIDDEN; BOOL TRASH_CanTrashFile(LPCWSTR wszPath) DECLSPEC_HIDDEN; BOOL TRASH_TrashFile(LPCWSTR wszPath) DECLSPEC_HIDDEN; HRESULT TRASH_UnpackItemID(LPCSHITEMID id, WIN32_FIND_DATAW *data) DECLSPEC_HIDDEN; -HRESULT TRASH_EnumItems(LPITEMIDLIST **pidls, int *count) DECLSPEC_HIDDEN; +HRESULT TRASH_EnumItems(const WCHAR *path, LPITEMIDLIST **pidls, int *count) DECLSPEC_HIDDEN; HRESULT TRASH_RestoreItem(LPCITEMIDLIST pidl) DECLSPEC_HIDDEN; HRESULT TRASH_EraseItem(LPCITEMIDLIST pidl) DECLSPEC_HIDDEN;

1 0

Piotr Caban : shell32: Add partial support for Mac trash enumeration.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: 6dac2f7a776e8dc994aae4e1714fc5f03565e132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dac2f7a776e8dc994aae4e17… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 30 17:03:44 2015 +0100 shell32: Add partial support for Mac trash enumeration. --- dlls/shell32/tests/recyclebin.c | 18 ++-- dlls/shell32/trash.c | 219 ++++++++++++++++++++++++++++++---------- 2 files changed, 170 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6dac2f7a776e8dc994aae…

1 0

Piotr Caban : msvcp71: Added basic_string<char>::insert(iterator, char*, char*) implementation.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: ae372f53f79a0cc22e88e63920fa83e9df5cd1e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae372f53f79a0cc22e88e6392… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jan 31 16:22:26 2015 +0100 msvcp71: Added basic_string<char>::insert(iterator, char*, char*) implementation. --- dlls/msvcp71/msvcp71.spec | 4 ++-- dlls/msvcp90/string.c | 27 +++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp71/msvcp71.spec b/dlls/msvcp71/msvcp71.spec index 0bac67c..6b62d5c 100644 --- a/dlls/msvcp71/msvcp71.spec +++ b/dlls/msvcp71/msvcp71.spec @@ -3832,8 +3832,8 @@ @ thiscall -arch=win32 ?insert@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)IPBDI@Z(ptr long ptr long) basic_string_char_insert_cstr_len @ cdecl -arch=win64 ?insert@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAAEAV12(a)_KPEBD@Z(ptr long str) basic_string_char_insert_cstr @ thiscall -arch=win32 ?insert@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXViterator(a)12@ID(a)Z(ptr ptr long long) basic_string_char_insert_iter_chn -@ thiscall -arch=win32 ?insert@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXViterator(a)12@PBD1(a)Z(ptr ptr ptr ptr) basic_string_wchar_insert_iter_ptr_ptr -@ thiscall -arch=win32 ?insert@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXViterator(a)12@Vconst_iterator(a)12@1(a)Z(ptr ptr ptr ptr) basic_string_wchar_insert_iter_beg_end +@ thiscall -arch=win32 ?insert@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXViterator(a)12@PBD1(a)Z(ptr ptr ptr ptr) basic_string_char_insert_iter_ptr_ptr +@ thiscall -arch=win32 ?insert@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXViterator(a)12@Vconst_iterator(a)12@1(a)Z(ptr ptr ptr ptr) basic_string_char_insert_iter_beg_end @ thiscall -arch=win32 ?insert@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE?AViterator(a)12@V312@@Z(ptr ptr ptr) basic_string_wchar_insert_iter_null @ thiscall -arch=win32 ?insert@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAE?AViterator(a)12@V312(a)G@Z(ptr ptr ptr long) basic_string_wchar_insert_iter_ch @ thiscall -arch=win32 ?insert@?$basic_string(a)GU?$char_traits(a)G@std@@V?$allocator(a)G@2@@std@@QAEAAV12(a)IABV12@@Z(ptr long ptr) basic_string_wchar_insert diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index 810fb5a..3afb375 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -4138,6 +4138,15 @@ basic_string_char* __thiscall basic_string_char_replace_iter_ch(basic_string_cha return this; } +static basic_string_char* basic_string_char_replace_iter_ptr_ptr(basic_string_char *this, + basic_string_char_iterator beg, basic_string_char_iterator end, + const char *res_beg, const char *res_end) +{ + basic_string_char_iterator begin = { basic_string_char_ptr(this) }; + return basic_string_char_replace_cstr_len(this, basic_string_char__Pdif(beg, begin), + basic_string_char__Pdif(end, beg), res_beg, res_end-res_beg); +} + /* ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)Viterator@12(a)0PBD1@Z */ /* ?replace@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEAAV12(a)V?$_Ptrit(a)DHPADAADPADAAD@2(a)0PBD1@Z */ DEFINE_THISCALL_WRAPPER(basic_string_char_replace_iter_beg_end, 20) @@ -4205,6 +4214,22 @@ basic_string_char_iterator* __thiscall basic_string_char_insert_iter_null(basic_ return basic_string_char_insert_iter_ch(this, ret, where, 0); } +/* ?insert@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXViterator(a)12@PBD1(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_string_char_insert_iter_ptr_ptr, 16) +void __thiscall basic_string_char_insert_iter_ptr_ptr(basic_string_char *this, + basic_string_char_iterator where, const char *beg, const char *end) +{ + basic_string_char_replace_iter_ptr_ptr(this, where, where, beg, end); +} + +/* ?insert@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXViterator(a)12@PBD1(a)Z */ +DEFINE_THISCALL_WRAPPER(basic_string_char_insert_iter_beg_end, 16) +void __thiscall basic_string_char_insert_iter_beg_end(basic_string_char *this, + basic_string_char_iterator where, basic_string_char_iterator beg, basic_string_char_iterator end) +{ + basic_string_char_replace_iter_ptr_ptr(this, where, where, beg.pos, end.pos); +} + /* ?begin@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AViterator(a)12@XZ */ /* ?begin@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QBE?AVconst_iterator(a)12@XZ */ /* ?rend@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAE?AV?$reverse_iterator(a)Viterator@?$basic_string(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@@2(a)XZ */ @@ -4360,8 +4385,6 @@ basic_string_wchar* __thiscall basic_string_wchar_replace_iter_ch(basic_string_w return this; } -/* ?replace@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QAEAAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0PB_W1@Z */ -/* ?replace@?$basic_string(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@std@@QEAAAEAV12(a)V?$_String_const_iterator(a)_WU?$char_traits(a)_W@std@@V?$allocator(a)_W@2@@2(a)0PEB_W1@Z */ static basic_string_wchar* basic_string_wchar_replace_iter_ptr_ptr(basic_string_wchar *this, basic_string_wchar_iterator beg, basic_string_wchar_iterator end, const wchar_t *res_beg, const wchar_t *res_end)

1 0

Matteo Bruni : opengl32: Don' t use deprecated functions for extension checking purposes on core profile contexts.
by Alexandre Julliard 02 Feb '15

02 Feb '15

Module: wine Branch: master Commit: 1e48bbb7acf3bfc43c5d041a2680d73aed9e40c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e48bbb7acf3bfc43c5d041a2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jan 29 18:45:00 2015 +0100 opengl32: Don't use deprecated functions for extension checking purposes on core profile contexts. --- dlls/opengl32/wgl.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 32d241c..cb91699 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -162,6 +162,12 @@ static void free_handle_ptr( struct wgl_handle *ptr ) LeaveCriticalSection( &wgl_section ); } +static inline enum wgl_handle_type get_current_context_type(void) +{ + if (!NtCurrentTeb()->glCurrentRC) return HANDLE_CONTEXT; + return (LOWORD(NtCurrentTeb()->glCurrentRC) & HANDLE_TYPE_MASK) >> 12; +} + /*********************************************************************** * wglCopyContext (OPENGL32.@) */ @@ -684,6 +690,30 @@ int WINAPI wglGetLayerPaletteEntries(HDC hdc, /* check if the extension is present in the list */ static BOOL has_extension( const char *list, const char *ext, size_t len ) { + if (!list) + { + const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; + const char *gl_ext; + unsigned int i; + GLint extensions_count; + + if (!funcs->ext.p_glGetStringi) + { + void **func_ptr = (void **)&funcs->ext.p_glGetStringi; + + *func_ptr = funcs->wgl.p_wglGetProcAddress("glGetStringi"); + } + + glGetIntegerv(GL_NUM_EXTENSIONS, &extensions_count); + for (i = 0; i < extensions_count; ++i) + { + gl_ext = (const char *)funcs->ext.p_glGetStringi(GL_EXTENSIONS, i); + if (!strncmp(gl_ext, ext, len) && !gl_ext[len]) + return TRUE; + } + return FALSE; + } + while (list) { while (*list == ' ') list++; @@ -701,15 +731,21 @@ static int compar(const void *elt_a, const void *elt_b) { /* Check if a GL extension is supported */ static BOOL is_extension_supported(const char* extension) { + enum wgl_handle_type type = get_current_context_type(); const struct opengl_funcs *funcs = NtCurrentTeb()->glTable; - const char *gl_ext_string = (const char*)glGetString(GL_EXTENSIONS); + const char *gl_ext_string = NULL; size_t len; TRACE("Checking for extension '%s'\n", extension); - if(!gl_ext_string) { - ERR("No OpenGL extensions found, check if your OpenGL setup is correct!\n"); - return FALSE; + if (type == HANDLE_CONTEXT) + { + gl_ext_string = (const char*)glGetString(GL_EXTENSIONS); + if (!gl_ext_string) + { + ERR("No OpenGL extensions found, check if your OpenGL setup is correct!\n"); + return FALSE; + } } /* We use the GetProcAddress function from the display driver to retrieve function pointers

1 0