September 2008 - Wine-commits

Nikolay Sivov : gdiplus: Add TRACE(..) to CustomLineCap.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 0f87374a175bc18aeaccc417d1e98e095657f077 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f87374a175bc18aeaccc417d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Sep 2 23:52:20 2008 +0400 gdiplus: Add TRACE(..) to CustomLineCap. --- dlls/gdiplus/customlinecap.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 48a20df..7fb7f4a 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -33,6 +33,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdiplus); GpStatus WINGDIPAPI GdipCloneCustomLineCap(GpCustomLineCap* from, GpCustomLineCap** to) { + TRACE("(%p, %p)\n", from, to); + if(!from || !to) return InvalidParameter; @@ -108,6 +110,8 @@ GpStatus WINGDIPAPI GdipCreateCustomLineCap(GpPath* fillPath, GpPath* strokePath GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap *customCap) { + TRACE("(%p)\n", customCap); + if(!customCap) return InvalidParameter; @@ -121,6 +125,8 @@ GpStatus WINGDIPAPI GdipDeleteCustomLineCap(GpCustomLineCap *customCap) GpStatus WINGDIPAPI GdipGetCustomLineCapStrokeJoin(GpCustomLineCap* customCap, GpLineJoin* lineJoin) { + TRACE("(%p, %p)\n", customCap, lineJoin); + if(!customCap || !lineJoin) return InvalidParameter; @@ -132,6 +138,8 @@ GpStatus WINGDIPAPI GdipGetCustomLineCapStrokeJoin(GpCustomLineCap* customCap, GpStatus WINGDIPAPI GdipGetCustomLineCapWidthScale(GpCustomLineCap* custom, REAL* widthScale) { + TRACE("(%p, %p)\n", custom, widthScale); + if(!custom || !widthScale) return InvalidParameter; @@ -168,6 +176,8 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapBaseCap(GpCustomLineCap* custom, GpStatus WINGDIPAPI GdipGetCustomLineCapBaseInset(GpCustomLineCap* custom, REAL* inset) { + TRACE("(%p, %p)\n", custom, inset); + if(!custom || !inset) return InvalidParameter; @@ -191,6 +201,8 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapBaseInset(GpCustomLineCap* custom, GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeJoin(GpCustomLineCap* custom, GpLineJoin join) { + TRACE("(%p, %d)\n", custom, join); + if(!custom) return InvalidParameter; @@ -212,6 +224,8 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapWidthScale(GpCustomLineCap* custom, GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap *customCap, GpLineCap *baseCap) { + TRACE("(%p, %p)\n", customCap, baseCap); + if(!customCap || !baseCap) return InvalidParameter;

1 0

Nikolay Sivov : gdiplus: Add some TRACE(..) to Graphics.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 29f4c9d8a06660ab9a73e2fcc29f510aa5225c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29f4c9d8a06660ab9a73e2fcc… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Sep 2 23:45:39 2008 +0400 gdiplus: Add some TRACE(..) to Graphics. --- dlls/gdiplus/graphics.c | 196 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 193 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=29f4c9d8a06660ab9a73e…

1 0

Paul Vriens : msxml3/tests: Fix a test on win98.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: e1c9c2597adc8b78f0c27c8433db4130ca231bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1c9c2597adc8b78f0c27c843… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Sep 3 09:48:49 2008 +0200 msxml3/tests: Fix a test on win98. --- dlls/msxml3/tests/xmlelem.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/tests/xmlelem.c b/dlls/msxml3/tests/xmlelem.c index 626984a..27c09c7 100644 --- a/dlls/msxml3/tests/xmlelem.c +++ b/dlls/msxml3/tests/xmlelem.c @@ -260,13 +260,13 @@ static void test_xmlelem_collection(void) IXMLElement *element = NULL, *child; IXMLElementCollection *collection = NULL; IEnumVARIANT *enumVar = NULL; + CHAR pathA[MAX_PATH]; WCHAR path[MAX_PATH]; long length, type; ULONG num_vars; VARIANT var, vIndex, vName; BSTR url, str; - - static const WCHAR szBankXML[] = {'b','a','n','k','.','x','m','l',0}; + static const CHAR szBankXML[] = "bank.xml"; static const WCHAR szNumber[] = {'N','U','M','B','E','R',0}; static const WCHAR szName[] = {'N','A','M','E',0}; @@ -278,13 +278,13 @@ static void test_xmlelem_collection(void) return; } - create_xml_file("bank.xml"); - GetFullPathNameW(szBankXML, MAX_PATH, path, NULL); + create_xml_file(szBankXML); + GetFullPathNameA(szBankXML, MAX_PATH, pathA, NULL); + MultiByteToWideChar(CP_ACP, 0, pathA, -1, path, MAX_PATH); url = SysAllocString(path); hr = IXMLDocument_put_URL(doc, url); - /* Win98 returns ERROR_URL_NOT_FOUND */ - ok(hr == S_OK || hr == ERROR_URL_NOT_FOUND, "Expected S_OK, got 0x%08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); SysFreeString(url); if(hr != S_OK)

1 0

Alexandre Julliard : programs: Build the programs that support it with -DWINE_NO_UNICODE_MACROS.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: b66685cdd8e537e20b2c527e61a3c315efaef905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b66685cdd8e537e20b2c527e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 3 11:30:44 2008 +0200 programs: Build the programs that support it with -DWINE_NO_UNICODE_MACROS. --- programs/control/Makefile.in | 1 + programs/control/control.c | 4 ++-- programs/eject/Makefile.in | 1 + programs/expand/Makefile.in | 1 + programs/expand/expand.c | 4 ++-- programs/explorer/Makefile.in | 1 + programs/explorer/systray.c | 12 ++++++------ programs/hh/Makefile.in | 1 + programs/hh/main.c | 2 +- programs/icinfo/Makefile.in | 1 + programs/iexplore/Makefile.in | 1 + programs/msiexec/Makefile.in | 1 + programs/msiexec/msiexec.c | 4 ++-- programs/msiexec/service.c | 6 +++--- programs/reg/Makefile.in | 1 + programs/regsvr32/Makefile.in | 1 + programs/regsvr32/regsvr32.c | 2 +- programs/rpcss/Makefile.in | 1 + programs/secedit/Makefile.in | 1 + programs/services/Makefile.in | 1 + programs/spoolsv/Makefile.in | 1 + programs/start/Makefile.in | 1 + programs/start/start.c | 6 +++--- programs/svchost/Makefile.in | 1 + programs/uninstaller/Makefile.in | 1 + programs/wineboot/Makefile.in | 1 + programs/wineboot/shutdown.c | 2 +- programs/winebrowser/Makefile.in | 1 + programs/winebrowser/main.c | 6 +++--- programs/winedevice/Makefile.in | 1 + programs/winemenubuilder/Makefile.in | 1 + programs/winepath/Makefile.in | 1 + programs/winepath/winepath.c | 4 ++-- programs/winevdm/Makefile.in | 1 + programs/winevdm/winevdm.c | 2 +- programs/winver/Makefile.in | 1 + programs/winver/winver.c | 6 +----- programs/write/Makefile.in | 1 + programs/write/write.c | 4 ++-- 39 files changed, 55 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b66685cdd8e537e20b2c5…

1 0

Alexander Dorofeyev : wined3d: Remove glFlush in RealizePalette.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: e13d0efb01f21b48c8bea1c248ba0aa47fb29813 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13d0efb01f21b48c8bea1c24… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Aug 31 17:05:30 2008 +0300 wined3d: Remove glFlush in RealizePalette. glFlush was added to surface_blt_to_drawable some time ago, which is a more general fix and makes this one superfluous. --- dlls/wined3d/surface.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 7870d4b..500b05d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3812,10 +3812,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { /* Re-upload the palette */ d3dfmt_p8_upload_palette(iface, convert); - - /* Without this some palette updates are missed. This at least happens on Nvidia drivers but - * it works fine using Mesa. */ - glFlush(); } else { if(!(This->Flags & SFLAG_INSYSMEM)) { TRACE("Palette changed with surface that does not have an up to date system memory copy\n");

1 0

Jim Cameron : dinput: Add IID_IUnknown to DICF_CreateInstance(), DirectInputCreateEx().
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: f20961d9fabe330bfe69e06f0065b95b442cd646 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f20961d9fabe330bfe69e06f0… Author: Jim Cameron <jim_24601(a)btinternet.com> Date: Tue Sep 2 22:17:17 2008 +0100 dinput: Add IID_IUnknown to DICF_CreateInstance(), DirectInputCreateEx(). --- dlls/dinput/dinput_main.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index f28fe25..6b52de4 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -114,7 +114,8 @@ HRESULT WINAPI DirectInputCreateEx( TRACE("(%p,%04x,%s,%p,%p)\n", hinst, dwVersion, debugstr_guid(riid), ppDI, punkOuter); - if (IsEqualGUID( &IID_IDirectInputA, riid ) || + if (IsEqualGUID( &IID_IUnknown, riid ) || + IsEqualGUID( &IID_IDirectInputA, riid ) || IsEqualGUID( &IID_IDirectInput2A, riid ) || IsEqualGUID( &IID_IDirectInput7A, riid ) || IsEqualGUID( &IID_IDirectInputW, riid ) || @@ -817,7 +818,8 @@ static HRESULT WINAPI DICF_CreateInstance( IClassFactoryImpl *This = (IClassFactoryImpl *)iface; TRACE("(%p)->(%p,%s,%p)\n",This,pOuter,debugstr_guid(riid),ppobj); - if ( IsEqualGUID( &IID_IDirectInputA, riid ) || + if ( IsEqualGUID( &IID_IUnknown, riid ) || + IsEqualGUID( &IID_IDirectInputA, riid ) || IsEqualGUID( &IID_IDirectInputW, riid ) || IsEqualGUID( &IID_IDirectInput2A, riid ) || IsEqualGUID( &IID_IDirectInput2W, riid ) ||

1 0

Paul Vriens : msxml3/tests: Use CreateFileA to please win98.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: fe360d6aa2d068e4a2081edf7b4c843b2faed691 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe360d6aa2d068e4a2081edf7… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Wed Sep 3 09:39:16 2008 +0200 msxml3/tests: Use CreateFileA to please win98. --- dlls/msxml3/tests/saxreader.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 0ff0fdf..88cd89f 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -477,7 +477,7 @@ static void test_saxreader(void) LARGE_INTEGER liPos; ULONG bytesWritten; HANDLE file; - + static const CHAR testXmlA[] = "test.xml"; static const WCHAR testXmlW[] = {'t','e','s','t','.','x','m','l',0}; hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, @@ -564,7 +564,7 @@ static void test_saxreader(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); test_expect_call(CH_ENDTEST); - file = CreateFileW(testXmlW, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + file = CreateFileA(testXmlA, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "Could not create file: %u\n", GetLastError()); WriteFile(file, szTestXML, sizeof(szTestXML)-1, &bytesWritten, NULL); CloseHandle(file); @@ -574,7 +574,7 @@ static void test_saxreader(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); test_expect_call(CH_ENDTEST); - DeleteFileW(testXmlW); + DeleteFileA(testXmlA); ISAXXMLReader_Release(reader); }

1 0

Alexander Nicolaysen Sørnes : regedit: Some minor unicode conversions.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: d67986b9dd3d23e8515df56eedb2888a91677704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d67986b9dd3d23e8515df56ee… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Sep 2 19:26:44 2008 +0200 regedit: Some minor unicode conversions. --- programs/regedit/childwnd.c | 2 +- programs/regedit/edit.c | 18 ++++++++++-------- programs/regedit/framewnd.c | 10 +++++----- programs/regedit/listview.c | 4 ++-- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 18323c0..6f9d487 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -379,7 +379,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa if (((int)wParam == LIST_WINDOW) && (g_pChildWnd != NULL)) { if (((LPNMHDR)lParam)->code == NM_SETFOCUS) { g_pChildWnd->nFocusPanel = 1; - } else if (!SendMessage(g_pChildWnd->hListWnd, WM_NOTIFY_REFLECT, wParam, lParam)) { + } else if (!SendMessageW(g_pChildWnd->hListWnd, WM_NOTIFY_REFLECT, wParam, lParam)) { goto def; } } diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 992caee..5856b64 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -87,17 +87,19 @@ void error(HWND hwnd, INT resId, ...) static void error_code_messagebox(HWND hwnd, DWORD error_code) { - LPTSTR lpMsgBuf; + LPWSTR lpMsgBuf; DWORD status; - TCHAR title[256]; - static TCHAR fallback[] = TEXT("Error displaying error message.\n"); - if (!LoadString(hInst, IDS_ERROR, title, COUNT_OF(title))) - lstrcpy(title, TEXT("Error")); - status = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, - NULL, error_code, 0, (LPTSTR)&lpMsgBuf, 0, NULL); + WCHAR title[256]; + static WCHAR fallback[] = {'E','r','r','o','r',' ','d','i','s','p','l','a','y','i','n','g',' ','e','r','r','o','r',' ','m','e','s','s','a','g','e','.','\n',0}; + static const WCHAR title_error[] = {'E','r','r','o','r',0}; + + if (!LoadStringW(hInst, IDS_ERROR, title, COUNT_OF(title))) + lstrcpyW(title, title_error); + status = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM, + NULL, error_code, 0, (LPWSTR)&lpMsgBuf, 0, NULL); if (!status) lpMsgBuf = fallback; - MessageBox(hwnd, lpMsgBuf, title, MB_OK | MB_ICONERROR); + MessageBoxW(hwnd, lpMsgBuf, title, MB_OK | MB_ICONERROR); if (lpMsgBuf != fallback) LocalFree(lpMsgBuf); } diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 0fef96e..a8e4c5c 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -56,7 +56,7 @@ static void resize_frame_rect(HWND hWnd, PRECT prect) RECT rt; /* if (IsWindowVisible(hToolBar)) { - SendMessage(hToolBar, WM_SIZE, 0, 0); + SendMessageW(hToolBar, WM_SIZE, 0, 0); GetClientRect(hToolBar, &rt); prect->top = rt.bottom+3; prect->bottom -= rt.bottom+3; @@ -607,8 +607,8 @@ static INT_PTR CALLBACK removefavorite_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM w } break; case IDOK: { - int pos = SendMessage(hwndList, LB_GETCURSEL, 0, 0); - int len = SendMessage(hwndList, LB_GETTEXTLEN, pos, 0); + int pos = SendMessageW(hwndList, LB_GETCURSEL, 0, 0); + int len = SendMessageW(hwndList, LB_GETTEXTLEN, pos, 0); if (len>0) { LPWSTR lpName = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(len+1)); SendMessageW(hwndList, LB_GETTEXT, pos, (LPARAM)lpName); @@ -739,7 +739,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) hItem = FindNext(g_pChildWnd->hTreeWnd, hItem, searchString, searchMask, &row); SetCursor(hcursorOld); if (hItem) { - SendMessage( g_pChildWnd->hTreeWnd, TVM_SELECTITEM, TVGN_CARET, (LPARAM) hItem ); + SendMessageW( g_pChildWnd->hTreeWnd, TVM_SELECTITEM, TVGN_CARET, (LPARAM) hItem ); InvalidateRect(g_pChildWnd->hTreeWnd, NULL, TRUE); UpdateWindow(g_pChildWnd->hTreeWnd); if (row != -1) { @@ -886,7 +886,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) if(ClientToScreen(g_pChildWnd->hWnd, &pts)) { SetCursorPos(pts.x, pts.y); SetCursor(LoadCursor(0, IDC_SIZEWE)); - SendMessage(g_pChildWnd->hWnd, WM_LBUTTONDOWN, 0, MAKELPARAM(pt.x, pt.y)); + SendMessageW(g_pChildWnd->hWnd, WM_LBUTTONDOWN, 0, MAKELPARAM(pt.x, pt.y)); } return TRUE; } diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 04f63ac..65efecb 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -411,7 +411,7 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR case NM_RETURN: { int cnt = ListView_GetNextItem(hWnd, -1, LVNI_FOCUSED | LVNI_SELECTED); if (cnt != -1) - SendMessage(hFrameWnd, WM_COMMAND, ID_EDIT_MODIFY, 0); + SendMessageW(hFrameWnd, WM_COMMAND, ID_EDIT_MODIFY, 0); } break; case NM_DBLCLK: { @@ -439,7 +439,7 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR ListView_SetItemState(hWnd, -1, 0, LVIS_FOCUSED|LVIS_SELECTED); ListView_SetItemState(hWnd, info.iItem, LVIS_FOCUSED|LVIS_SELECTED, LVIS_FOCUSED|LVIS_SELECTED); - SendMessage(hFrameWnd, WM_COMMAND, ID_EDIT_MODIFY, 0); + SendMessageW(hFrameWnd, WM_COMMAND, ID_EDIT_MODIFY, 0); } } break;

1 0

Alexander Dorofeyev : wined3d: Add glFlush when clearing the front buffer in ClearSurface.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: 379f4009903a63ee6f5a6c47603c7b958e906042 URL: http://source.winehq.org/git/wine.git/?a=commit;h=379f4009903a63ee6f5a6c476… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Sun Aug 31 17:05:26 2008 +0300 wined3d: Add glFlush when clearing the front buffer in ClearSurface. --- dlls/wined3d/device.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 609b77f..2085b07 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4995,6 +4995,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa WINED3DVIEWPORT *vp = &This->stateBlock->viewport; UINT drawable_width, drawable_height; IWineD3DSurfaceImpl *depth_stencil = (IWineD3DSurfaceImpl *) This->stencilBufferTarget; + IWineD3DSwapChainImpl *swapchain = NULL; /* When we're clearing parts of the drawable, make sure that the target surface is well up to date in the * drawable. After the clear we'll mark the drawable up to date, so we have to make sure that this is true @@ -5164,6 +5165,14 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa LEAVE_GL(); + IWineD3DSurface_GetContainer( (IWineD3DSurface *) target, &IID_IWineD3DSwapChain, (void **)&swapchain); + if (swapchain) { + if (target == (IWineD3DSurfaceImpl*) swapchain->frontBuffer) { + glFlush(); + } + IWineD3DSwapChain_Release((IWineD3DSwapChain *) swapchain); + } + return WINED3D_OK; }

1 0

Alexander Nicolaysen Sørnes : regedit: Fix some references to TCHARs.
by Alexandre Julliard 03 Sep '08

03 Sep '08

Module: wine Branch: master Commit: ba093c6dc0b181c7be6f5bcd468c4cb8ae53d423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba093c6dc0b181c7be6f5bcd4… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Sep 2 18:41:42 2008 +0200 regedit: Fix some references to TCHARs. --- programs/regedit/childwnd.c | 4 ++-- programs/regedit/edit.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 9879c95..11a8d2a 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -123,7 +123,7 @@ static LPWSTR CombinePaths(LPCWSTR pPaths[], int nPaths) { if (!*combined) lstrcpyW(combined, pPaths[i]); else { - combined[pos++] = (TCHAR)'\\'; + combined[pos++] = '\\'; lstrcpyW(combined+pos, pPaths[i]); } pos += llen; @@ -144,7 +144,7 @@ static LPWSTR GetPathRoot(HWND hwndTV, HTREEITEM hItem, BOOL bFull) { if (hRootKey) parts[1] = GetRootKeyNameW(hRootKey); if (bFull) { - DWORD dwSize = sizeof(text)/sizeof(TCHAR); + DWORD dwSize = sizeof(text)/sizeof(WCHAR); GetComputerNameW(text, &dwSize); parts[0] = text; } diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c index 15dc57a..992caee 100644 --- a/programs/regedit/edit.c +++ b/programs/regedit/edit.c @@ -379,7 +379,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName) HeapFree( GetProcessHeap(), 0, stringValueData); stringValueData = tmpValueData; - lRet = RegSetValueExW(hKey, valueName, 0, type, (LPBYTE)stringValueData, j * sizeof(TCHAR)); + lRet = RegSetValueExW(hKey, valueName, 0, type, (LPBYTE)stringValueData, j * sizeof(WCHAR)); if (lRet == ERROR_SUCCESS) result = TRUE; else error_code_messagebox(hwnd, lRet); }

1 0