wine-commits December 2016

wine-commits@winehq.org

2 participants
342 discussions

Alex Henrie : user32: Tell MENU_SuspendPopup which message to remove.
by Alexandre Julliard 06 Dec '16

06 Dec '16

Module: wine Branch: master Commit: 68ca28a8bc3197a09cd3b82d90969f44f844dc2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=68ca28a8bc3197a09cd3b82d9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 5 21:28:50 2016 -0700 user32: Tell MENU_SuspendPopup which message to remove. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/menu.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 45ce7f5..59fcd9c 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2806,7 +2806,7 @@ static LRESULT MENU_DoNextMenu( MTRACKER* pmt, UINT vk, UINT wFlags ) * The idea is not to show the popup if the next input message is * going to hide it anyway. */ -static BOOL MENU_SuspendPopup( MTRACKER* pmt, UINT16 uMsg ) +static BOOL MENU_SuspendPopup( MTRACKER* pmt, UINT uMsg ) { MSG msg; @@ -2878,7 +2878,7 @@ static BOOL MENU_KeyEscape(MTRACKER* pmt, UINT wFlags) * * Handle a VK_LEFT key event in a menu. */ -static void MENU_KeyLeft( MTRACKER* pmt, UINT wFlags ) +static void MENU_KeyLeft( MTRACKER* pmt, UINT wFlags, UINT msg ) { POPUPMENU *menu; HMENU hmenutmp, hmenuprev; @@ -2918,7 +2918,7 @@ static void MENU_KeyLeft( MTRACKER* pmt, UINT wFlags ) /* A sublevel menu was displayed - display the next one * unless there is another displacement coming up */ - if( !MENU_SuspendPopup( pmt, WM_KEYDOWN ) ) + if( !MENU_SuspendPopup( pmt, msg ) ) pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, pmt->hTopMenu, TRUE, wFlags); } @@ -2931,7 +2931,7 @@ static void MENU_KeyLeft( MTRACKER* pmt, UINT wFlags ) * * Handle a VK_RIGHT key event in a menu. */ -static void MENU_KeyRight( MTRACKER* pmt, UINT wFlags ) +static void MENU_KeyRight( MTRACKER* pmt, UINT wFlags, UINT msg ) { HMENU hmenutmp; POPUPMENU *menu = MENU_GetMenu( pmt->hTopMenu ); @@ -2975,7 +2975,7 @@ static void MENU_KeyRight( MTRACKER* pmt, UINT wFlags ) MENU_MoveSelection( pmt->hOwnerWnd, pmt->hTopMenu, ITEM_NEXT ); if( hmenutmp || pmt->trackFlags & TF_SUSPENDPOPUP ) - if( !MENU_SuspendPopup(pmt, WM_KEYDOWN) ) + if( !MENU_SuspendPopup( pmt, msg ) ) pmt->hCurrentMenu = MENU_ShowSubPopup(pmt->hOwnerWnd, pmt->hTopMenu, TRUE, wFlags); } @@ -3178,11 +3178,11 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, break; case VK_LEFT: - MENU_KeyLeft( &mt, wFlags ); + MENU_KeyLeft( &mt, wFlags, msg.message ); break; case VK_RIGHT: - MENU_KeyRight( &mt, wFlags ); + MENU_KeyRight( &mt, wFlags, msg.message ); break; case VK_ESCAPE:

1 0

Huw Davies : kernel32: Implement Process thread attribute lists.
by Alexandre Julliard 06 Dec '16

06 Dec '16

Module: wine Branch: master Commit: 4c146152ddd60829195fb9735eca5cf99d35383b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c146152ddd60829195fb9735… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Dec 5 11:41:51 2016 +0000 kernel32: Implement Process thread attribute lists. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-0.spec | 6 +- .../api-ms-win-core-processthreads-l1-1-1.spec | 6 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 6 +- dlls/kernel32/kernel32.spec | 6 +- dlls/kernel32/process.c | 120 ++++++++++++++++++++ dlls/kernel32/tests/process.c | 123 +++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 6 +- include/winbase.h | 41 +++++++ 8 files changed, 299 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4c146152ddd60829195fb…

1 0

Huw Davies : comctl32: Recompute the text width if necessary.
by Alexandre Julliard 06 Dec '16

06 Dec '16

Module: wine Branch: master Commit: c7c8994f3579e624c1b0ceb353ab6c0208881e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7c8994f3579e624c1b0ceb35… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 6 10:25:27 2016 +0000 comctl32: Recompute the text width if necessary. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/treeview.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 0a155bb..74206bd 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -3703,6 +3703,9 @@ TREEVIEW_HitTest(const TREEVIEW_INFO *infoPtr, LPTVHITTESTINFO lpht) return NULL; } + if (!item->textWidth) + TREEVIEW_ComputeTextWidth(infoPtr, item, 0); + if (x >= item->textOffset + item->textWidth) { lpht->flags = TVHT_ONITEMRIGHT;

1 0

Huw Davies : comctl32: Set the text and bkgnd colours to the default before the item pre-paint notification.
by Alexandre Julliard 06 Dec '16

06 Dec '16

Module: wine Branch: master Commit: 3ed6ba579e6267cf8f0561f6de5f30e33bf3b222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ed6ba579e6267cf8f0561f6d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 6 10:25:26 2016 +0000 comctl32: Set the text and bkgnd colours to the default before the item pre-paint notification. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 17 ++++++++++++++--- dlls/comctl32/treeview.c | 8 +++++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 388124a..9031a83 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -42,6 +42,7 @@ static BOOL g_disp_A_to_W; static BOOL g_disp_set_stateimage; static BOOL g_beginedit_alter_text; static HFONT g_customdraw_font; +static BOOL g_v6; #define NUM_MSG_SEQUENCES 3 #define TREEVIEW_SEQ_INDEX 0 @@ -1261,6 +1262,7 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, { NMTVCUSTOMDRAW *nmcd = (NMTVCUSTOMDRAW*)lParam; COLORREF c0ffee = RGB(0xc0,0xff,0xee), cafe = RGB(0xca,0xfe,0x00); + COLORREF text = GetTextColor(nmcd->nmcd.hdc), bkgnd = GetBkColor(nmcd->nmcd.hdc); msg.flags |= custdraw; msg.stage = nmcd->nmcd.dwDrawStage; @@ -1271,15 +1273,23 @@ static LRESULT CALLBACK parent_wnd_proc(HWND hWnd, UINT message, WPARAM wParam, case CDDS_PREPAINT: return CDRF_NOTIFYITEMDRAW|CDRF_NOTIFYITEMERASE|CDRF_NOTIFYPOSTPAINT; case CDDS_ITEMPREPAINT: - nmcd->clrTextBk = c0ffee; + ok(text == nmcd->clrText || (g_v6 && nmcd->clrText == 0xffffffff), + "got %08x vs %08x\n", text, nmcd->clrText); + ok(bkgnd == nmcd->clrTextBk || (g_v6 && nmcd->clrTextBk == 0xffffffff), + "got %08x vs %08x\n", bkgnd, nmcd->clrTextBk); nmcd->clrText = cafe; + nmcd->clrTextBk = c0ffee; + SetTextColor(nmcd->nmcd.hdc, c0ffee); + SetBkColor(nmcd->nmcd.hdc, cafe); if (g_customdraw_font) SelectObject(nmcd->nmcd.hdc, g_customdraw_font); return CDRF_NOTIFYPOSTPAINT|CDRF_NEWFONT; case CDDS_ITEMPOSTPAINT: /* at the point of post paint notification colors are already restored */ - ok(GetTextColor(nmcd->nmcd.hdc) != cafe, "got 0%x\n", GetTextColor(nmcd->nmcd.hdc)); - ok(GetBkColor(nmcd->nmcd.hdc) != c0ffee, "got 0%x\n", GetBkColor(nmcd->nmcd.hdc)); + ok(nmcd->clrText == cafe, "got 0%x\n", nmcd->clrText); + ok(nmcd->clrTextBk == c0ffee, "got 0%x\n", nmcd->clrTextBk); + ok(text != cafe, "got 0%x\n", text); + ok(bkgnd != c0ffee, "got 0%x\n", bkgnd); if (g_customdraw_font) ok(GetCurrentObject(nmcd->nmcd.hdc, OBJ_FONT) != g_customdraw_font, "got %p\n", GetCurrentObject(nmcd->nmcd.hdc, OBJ_FONT)); @@ -2471,6 +2481,7 @@ START_TEST(treeview) } /* comctl32 version 6 tests start here */ + g_v6 = TRUE; test_expandedimage(); test_htreeitem_layout(); test_WM_GETDLGCODE(); diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 70d6362..0a155bb 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2552,6 +2552,8 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item) } hOldFont = SelectObject(hdc, TREEVIEW_FontForItem(infoPtr, item)); + oldTextColor = SetTextColor(hdc, nmcdhdr.clrText); + oldTextBkColor = SetBkColor(hdc, nmcdhdr.clrTextBk); /* The custom draw handler can query the text rectangle, * so get ready. */ @@ -2586,9 +2588,9 @@ TREEVIEW_DrawItem(const TREEVIEW_INFO *infoPtr, HDC hdc, TREEVIEW_ITEM *item) TREEVIEW_DrawItemLines(infoPtr, hdc, item); - /* Set colors. Custom draw handler can change these so we do this after it. */ - oldTextColor = SetTextColor(hdc, nmcdhdr.clrText); - oldTextBkColor = SetBkColor(hdc, nmcdhdr.clrTextBk); + /* reset colors. Custom draw handler can change them */ + SetTextColor(hdc, nmcdhdr.clrText); + SetBkColor(hdc, nmcdhdr.clrTextBk); centery = (item->rect.top + item->rect.bottom) / 2;

1 0

Huw Davies : comctl32/tests: Use more than one item for the custom draw tests.
by Alexandre Julliard 06 Dec '16

06 Dec '16

Module: wine Branch: master Commit: 3f0002020ae401d3ee740443257b512061d4d9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f0002020ae401d3ee7404432… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Dec 6 10:25:25 2016 +0000 comctl32/tests: Use more than one item for the custom draw tests. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index e2fb443..388124a 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -328,6 +328,8 @@ static const struct message parent_cd_seq[] = { { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_PREPAINT }, { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPREPAINT }, + { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_ITEMPOSTPAINT }, { WM_NOTIFY, sent|id|custdraw, 0, 0, NM_CUSTOMDRAW, CDDS_POSTPAINT }, { 0 } }; @@ -2317,20 +2319,12 @@ static void test_WM_GETDLGCODE(void) static void test_customdraw(void) { - static const char *rootA = "root"; - TVINSERTSTRUCTA ins; - HTREEITEM hRoot; LOGFONTA lf; HWND hwnd; hwnd = create_treeview_control(0); - - ins.hParent = TVI_ROOT; - ins.hInsertAfter = TVI_ROOT; - U(ins).item.mask = TVIF_TEXT; - U(ins).item.pszText = (char*)rootA; - hRoot = TreeView_InsertItemA(hwnd, &ins); - ok(hRoot != NULL, "got %p\n", hRoot); + fill_tree(hwnd); + SendMessageA(hwnd, TVM_EXPAND, TVE_EXPAND, (WPARAM)hRoot); /* create additional font, custom draw handler will select it */ SystemParametersInfoA(SPI_GETICONTITLELOGFONT, sizeof(lf), &lf, 0);

1 0

Hans Leidekker : rpcrt4/tests: Register an exception with the firewall to avoid a dialog.
by Alexandre Julliard 06 Dec '16

06 Dec '16

Module: wine Branch: master Commit: 462d348e8d14a49a291c1a95d1950743310f8871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=462d348e8d14a49a291c1a95d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 6 09:35:35 2016 +0100 rpcrt4/tests: Register an exception with the firewall to avoid a dialog. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/Makefile.in | 2 +- dlls/rpcrt4/tests/server.c | 145 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/Makefile.in b/dlls/rpcrt4/tests/Makefile.in index 5229d07..2a72b57 100644 --- a/dlls/rpcrt4/tests/Makefile.in +++ b/dlls/rpcrt4/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = rpcrt4.dll -IMPORTS = ole32 rpcrt4 secur32 advapi32 +IMPORTS = oleaut32 ole32 rpcrt4 secur32 advapi32 EXTRAIDLFLAGS = --prefix-server=s_ C_SRCS = \ diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index 89dc27a..c196c79 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -18,10 +18,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS #include <windows.h> #include <ole2.h> +#include <oleauto.h> #include <secext.h> #include <rpcdce.h> +#include <initguid.h> +#include <netfw.h> #include "wine/test.h" #include "server.h" #include "server_defines.h" @@ -1755,14 +1759,142 @@ server(void) } } +static BOOL is_process_elevated(void) +{ + HANDLE token; + if (OpenProcessToken( GetCurrentProcess(), TOKEN_QUERY, &token )) + { + TOKEN_ELEVATION_TYPE type; + DWORD size; + BOOL ret; + + ret = GetTokenInformation( token, TokenElevationType, &type, sizeof(type), &size ); + CloseHandle( token ); + return (ret && type == TokenElevationTypeFull); + } + return FALSE; +} + +static BOOL is_firewall_enabled(void) +{ + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + VARIANT_BOOL enabled = VARIANT_FALSE; + + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + hr = INetFwProfile_get_FirewallEnabled( profile, &enabled ); + ok( hr == S_OK, "got %08x\n", hr ); + +done: + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + return (enabled == VARIANT_TRUE); +} + +enum firewall_op +{ + APP_ADD, + APP_REMOVE +}; + +static HRESULT set_firewall( enum firewall_op op ) +{ + static const WCHAR testW[] = {'r','p','c','r','t','4','_','t','e','s','t',0}; + HRESULT hr, init; + INetFwMgr *mgr = NULL; + INetFwPolicy *policy = NULL; + INetFwProfile *profile = NULL; + INetFwAuthorizedApplication *app = NULL; + INetFwAuthorizedApplications *apps = NULL; + BSTR name, image = SysAllocStringLen( NULL, MAX_PATH ); + + if (!GetModuleFileNameW( NULL, image, MAX_PATH )) + { + SysFreeString( image ); + return E_FAIL; + } + init = CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); + + hr = CoCreateInstance( &CLSID_NetFwMgr, NULL, CLSCTX_INPROC_SERVER, &IID_INetFwMgr, + (void **)&mgr ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwMgr_get_LocalPolicy( mgr, &policy ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwPolicy_get_CurrentProfile( policy, &profile ); + if (hr != S_OK) goto done; + + INetFwProfile_get_AuthorizedApplications( profile, &apps ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = CoCreateInstance( &CLSID_NetFwAuthorizedApplication, NULL, CLSCTX_INPROC_SERVER, + &IID_INetFwAuthorizedApplication, (void **)&app ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + hr = INetFwAuthorizedApplication_put_ProcessImageFileName( app, image ); + if (hr != S_OK) goto done; + + name = SysAllocString( testW ); + hr = INetFwAuthorizedApplication_put_Name( app, name ); + SysFreeString( name ); + ok( hr == S_OK, "got %08x\n", hr ); + if (hr != S_OK) goto done; + + if (op == APP_ADD) + hr = INetFwAuthorizedApplications_Add( apps, app ); + else if (op == APP_REMOVE) + hr = INetFwAuthorizedApplications_Remove( apps, image ); + else + hr = E_INVALIDARG; + +done: + if (app) INetFwAuthorizedApplication_Release( app ); + if (apps) INetFwAuthorizedApplications_Release( apps ); + if (policy) INetFwPolicy_Release( policy ); + if (profile) INetFwProfile_Release( profile ); + if (mgr) INetFwMgr_Release( mgr ); + if (SUCCEEDED( init )) CoUninitialize(); + SysFreeString( image ); + return hr; +} + START_TEST(server) { ULONG size = 0; int argc; char **argv; + BOOL firewall_enabled = is_firewall_enabled(); InitFunctionPointers(); + if (firewall_enabled && !is_process_elevated()) + { + trace("no privileges, skipping tests to avoid firewall dialog\n"); + return; + } + ok(!GetUserNameExA(NameSamCompatible, NULL, &size), "GetUserNameExA\n"); domain_and_user = HeapAlloc(GetProcessHeap(), 0, size); ok(GetUserNameExA(NameSamCompatible, domain_and_user, &size), "GetUserNameExA\n"); @@ -1783,7 +1915,20 @@ START_TEST(server) RpcEndExcept } else + { + if (firewall_enabled) + { + HRESULT hr = set_firewall(APP_ADD); + if (hr != S_OK) + { + skip("can't authorize app in firewall %08x\n", hr); + HeapFree(GetProcessHeap(), 0, domain_and_user); + return; + } + } server(); + if (firewall_enabled) set_firewall(APP_REMOVE); + } HeapFree(GetProcessHeap(), 0, domain_and_user); }

1 0

Lauri Kenttä : cmd: Compare handles to INVALID_HANDLE_VALUE, not NULL.
by Alexandre Julliard 06 Dec '16

06 Dec '16

Module: wine Branch: master Commit: 048a80ffe48a26b21f5d5a4333683a3beb6baa20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=048a80ffe48a26b21f5d5a433… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Dec 5 19:07:07 2016 +0200 cmd: Compare handles to INVALID_HANDLE_VALUE, not NULL. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index a29a502..f82f15a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -444,7 +444,7 @@ static BOOL WCMD_AppendEOF(WCHAR *filename) h = CreateFileW(filename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (h == NULL) { + if (h == INVALID_HANDLE_VALUE) { WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(filename), GetLastError()); return FALSE; } else { @@ -478,7 +478,7 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app in = CreateFileW(srcname, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - if (in == NULL) { + if (in == INVALID_HANDLE_VALUE) { WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(srcname), GetLastError()); return FALSE; } @@ -486,7 +486,7 @@ static BOOL WCMD_ManualCopy(WCHAR *srcname, WCHAR *dstname, BOOL ascii, BOOL app /* Open the output file, overwriting if not appending */ out = CreateFileW(dstname, GENERIC_WRITE, 0, NULL, append?OPEN_EXISTING:CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if (out == NULL) { + if (out == INVALID_HANDLE_VALUE) { WINE_ERR("Failed to open %s (%d)\n", wine_dbgstr_w(dstname), GetLastError()); CloseHandle(in); return FALSE;

1 0

Lauri Kenttä : winemac.drv: Compare handle to INVALID_HANDLE_VALUE, not NULL.
by Alexandre Julliard 06 Dec '16

06 Dec '16

Module: wine Branch: master Commit: f447b644a50a3fda7749865696e48c52c6bdbc55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f447b644a50a3fda774986569… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Mon Dec 5 19:32:24 2016 +0200 winemac.drv: Compare handle to INVALID_HANDLE_VALUE, not NULL. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index d6a8c1f..3f06ed9 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1934,7 +1934,7 @@ void CDECL macdrv_UpdateClipboard(void) if (!(pipe_name = get_pipe_name())) return; pipe = CreateFileW(pipe_name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_OVERLAPPED, NULL); - if (!pipe) + if (pipe == INVALID_HANDLE_VALUE) { WARN("failed to open pipe to clipboard manager: %d\n", GetLastError()); return;

1 0

Józef Kucia : wined3d: Use single structure for view description.
by Alexandre Julliard 06 Dec '16

06 Dec '16

Module: wine Branch: master Commit: 5ee3f54438934a2f41b4797f1b8b9a4e7674bddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ee3f54438934a2f41b4797f1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:41 2016 +0100 wined3d: Use single structure for view description. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 29 ++++++++++++++++++++--------- dlls/wined3d/device.c | 10 ++++++++-- dlls/wined3d/surface.c | 8 ++++++-- dlls/wined3d/swapchain.c | 4 +++- dlls/wined3d/view.c | 20 ++++++++++++-------- include/wine/wined3d.h | 47 ++++------------------------------------------- 6 files changed, 53 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ee3f54438934a2f41b47…

1 0

Józef Kucia : wined3d: Recognize SM5 imm_atomic_umin opcode.
by Alexandre Julliard 06 Dec '16

06 Dec '16

Module: wine Branch: master Commit: 663dee140fdb5bbe940c0082d423848699331f65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=663dee140fdb5bbe940c0082d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Dec 5 12:04:40 2016 +0100 wined3d: Recognize SM5 imm_atomic_umin opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 508f927..4b04490 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5310,6 +5310,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, + /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMUL */ NULL, /* WINED3DSIH_INE */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 45c53b6..434444a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8973,6 +8973,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IMM_ATOMIC_EXCH */ NULL, /* WINED3DSIH_IMM_ATOMIC_OR */ NULL, /* WINED3DSIH_IMM_ATOMIC_UMAX */ NULL, + /* WINED3DSIH_IMM_ATOMIC_UMIN */ NULL, /* WINED3DSIH_IMM_ATOMIC_XOR */ NULL, /* WINED3DSIH_IMUL */ shader_glsl_imul, /* WINED3DSIH_INE */ shader_glsl_relop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index bb2a213..a34694b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -151,6 +151,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_IMM_ATOMIC_EXCH */ "imm_atomic_exch", /* WINED3DSIH_IMM_ATOMIC_OR */ "imm_atomic_or", /* WINED3DSIH_IMM_ATOMIC_UMAX */ "imm_atomic_umax", + /* WINED3DSIH_IMM_ATOMIC_UMIN */ "imm_atomic_umin", /* WINED3DSIH_IMM_ATOMIC_XOR */ "imm_atomic_xor", /* WINED3DSIH_IMUL */ "imul", /* WINED3DSIH_INE */ "ine", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 11b17a6..d0497ce 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -266,6 +266,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_IMM_ATOMIC_EXCH = 0xb8, WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH = 0xb9, WINED3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, + WINED3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, WINED3D_SM5_OP_SYNC = 0xbe, }; @@ -923,6 +924,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_EXCH, "uU", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_CMP_EXCH, WINED3DSIH_IMM_ATOMIC_CMP_EXCH, "uU", "iuu"}, {WINED3D_SM5_OP_IMM_ATOMIC_UMAX, WINED3DSIH_IMM_ATOMIC_UMAX, "uU", "iu"}, + {WINED3D_SM5_OP_IMM_ATOMIC_UMIN, WINED3DSIH_IMM_ATOMIC_UMIN, "uU", "iu"}, {WINED3D_SM5_OP_SYNC, WINED3DSIH_SYNC, "", "", shader_sm5_read_sync}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3ece139..0e6dcb0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -677,6 +677,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_IMM_ATOMIC_EXCH, WINED3DSIH_IMM_ATOMIC_OR, WINED3DSIH_IMM_ATOMIC_UMAX, + WINED3DSIH_IMM_ATOMIC_UMIN, WINED3DSIH_IMM_ATOMIC_XOR, WINED3DSIH_IMUL, WINED3DSIH_INE,

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2016