June 2016 - Wine-Commits - list.winehq.org

Nikolay Sivov : msscript: Added IOleObject stub.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: b4800237522c9553c23f420531990428d921b924 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4800237522c9553c23f42053… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 6 12:45:54 2016 +0300 msscript: Added IOleObject stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msscript.ocx/msscript.c | 246 ++++++++++++++++++++++++++++ dlls/msscript.ocx/tests/Makefile.in | 7 + dlls/msscript.ocx/tests/msscript.c | 58 +++++++ dlls/msscript.ocx/tests/msscript.idl | 306 +++++++++++++++++++++++++++++++++++ 6 files changed, 619 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b4800237522c9553c23f4…

1 0

Michael Stefaniuc : user32: Use InflateRect() instead of open coding it.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: 9ed915083f2749a47a70c7c6cfe48d9955d317fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ed915083f2749a47a70c7c6c… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 6 11:16:11 2016 +0200 user32: Use InflateRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/scroll.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/user32/scroll.c b/dlls/user32/scroll.c index a210962..4b572e5 100644 --- a/dlls/user32/scroll.c +++ b/dlls/user32/scroll.c @@ -360,18 +360,12 @@ static BOOL SCROLL_PtInRectEx( LPRECT lpRect, POINT pt, BOOL vertical ) if (vertical) { scrollbarWidth = lpRect->right - lpRect->left; - rect.left -= scrollbarWidth*8; - rect.right += scrollbarWidth*8; - rect.top -= scrollbarWidth*2; - rect.bottom += scrollbarWidth*2; + InflateRect(&rect, scrollbarWidth * 8, scrollbarWidth * 2); } else { scrollbarWidth = lpRect->bottom - lpRect->top; - rect.left -= scrollbarWidth*2; - rect.right += scrollbarWidth*2; - rect.top -= scrollbarWidth*8; - rect.bottom += scrollbarWidth*8; + InflateRect(&rect, scrollbarWidth * 2, scrollbarWidth * 8); } return PtInRect( &rect, pt ); }

1 0

Michael Stefaniuc : comctl32/tests: Use EqualRect() instead of open coding it.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: fe9f23a2cb0a507917197db86c9f9be7142338da URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe9f23a2cb0a507917197db86… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 6 11:14:05 2016 +0200 comctl32/tests: Use EqualRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/rebar.c | 4 ++-- dlls/comctl32/tests/toolbar.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index a016298..0c3e2dd 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -35,8 +35,8 @@ static HWND hMainWnd; static int system_font_height; -#define check_rect(name, val, exp) ok(val.top == exp.top && val.bottom == exp.bottom && \ - val.left == exp.left && val.right == exp.right, "invalid rect (" name ") (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d)\n", \ +#define check_rect(name, val, exp) ok(EqualRect(&val, &exp), \ + "invalid rect (" name ") (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d)\n", \ val.left, val.top, val.right, val.bottom, exp.left, exp.top, exp.right, exp.bottom); #define check_rect_no_top(name, val, exp) { \ diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 5e18126..01c4214 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -108,8 +108,8 @@ static const struct message restore_parent_seq[] = { #define expect(EXPECTED,GOT) ok((GOT)==(EXPECTED), "Expected %d, got %d\n", (EXPECTED), (GOT)) -#define check_rect(name, val, exp, ...) ok(val.top == exp.top && val.bottom == exp.bottom && \ - val.left == exp.left && val.right == exp.right, "invalid rect (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d) - (" name ")\n", \ +#define check_rect(name, val, exp, ...) ok(EqualRect(&val, &exp), \ + "invalid rect (%d,%d) (%d,%d) - expected (%d,%d) (%d,%d) - (" name ")\n", \ val.left, val.top, val.right, val.bottom, exp.left, exp.top, exp.right, exp.bottom, __VA_ARGS__); #define compare(val, exp, format) ok((val) == (exp), #val " value " format " expected " format "\n", (val), (exp));

1 0

Andrey Gusev : include: Fix a typo in IWMReaderAdvanced interface.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: 7f548e3f500cf98cfb6c398bd7197e4a42edd74e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f548e3f500cf98cfb6c398bd… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jun 3 18:15:26 2016 +0300 include: Fix a typo in IWMReaderAdvanced interface. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wmsdkidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index ddfd12b..0606be1 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -549,7 +549,7 @@ interface IWMReaderAdvanced : IUnknown [in] BOOL fAllocate); HRESULT GetAllocateForStream( - [in] WORD dwSreamNum, + [in] WORD dwStreamNum, [out] BOOL *pfAllocate); HRESULT GetStatistics(

1 0

Andrey Gusev : gdiplus: Fix a typo in struct GpAdjustableArrowCap.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: bddba301bee3ba2264921736de8bbda1266bab80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bddba301bee3ba2264921736d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jun 3 18:11:53 2016 +0300 gdiplus: Fix a typo in struct GpAdjustableArrowCap. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/gdiplus_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 10092f1..9b29d88 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -314,7 +314,7 @@ struct GpCustomLineCap{ REAL scale; }; -struct GpAdustableArrowCap{ +struct GpAdjustableArrowCap{ GpCustomLineCap cap; };

1 0

Grazvydas Ignotas : wined3d: Use Intel data returned by Windows driver.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: 898e477e6a103ec5aa533758a44b944a0de57e7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=898e477e6a103ec5aa533758a… Author: Grazvydas Ignotas <notasas(a)gmail.com> Date: Sat Jun 4 23:07:00 2016 +0300 wined3d: Use Intel data returned by Windows driver. The returned VRAM size seems to vary between 1600-1800 MB, probably depends on the system, I chose 1536 (1024+512) just to be safe. Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2472c67..c2a83fe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -49,6 +49,7 @@ enum wined3d_display_driver DRIVER_INTEL_GMA900, DRIVER_INTEL_GMA950, DRIVER_INTEL_GMA3000, + DRIVER_INTEL_HD4000, DRIVER_NVIDIA_TNT, DRIVER_NVIDIA_GEFORCE2MX, DRIVER_NVIDIA_GEFORCEFX, @@ -1162,6 +1163,7 @@ static const struct driver_version_information driver_version_table[] = {DRIVER_INTEL_GMA3000, DRIVER_MODEL_NT5X, "igxprd32.dll", 14, 10, 5218}, {DRIVER_INTEL_GMA950, DRIVER_MODEL_NT6X, "igdumd32.dll", 14, 10, 1504}, {DRIVER_INTEL_GMA3000, DRIVER_MODEL_NT6X, "igdumd32.dll", 15, 10, 1666}, + {DRIVER_INTEL_HD4000, DRIVER_MODEL_NT6X, "igdumdim32.dll", 19, 15, 4352}, /* Nvidia * - Geforce8 and newer is supported by the current 340.52 driver on XP-Win8 @@ -1378,15 +1380,15 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_Q45, "Intel(R) Q45/Q43", DRIVER_INTEL_GMA3000, 512}, {HW_VENDOR_INTEL, CARD_INTEL_G41, "Intel(R) G41", DRIVER_INTEL_GMA3000, 512}, {HW_VENDOR_INTEL, CARD_INTEL_B43, "Intel(R) B43", DRIVER_INTEL_GMA3000, 512}, - {HW_VENDOR_INTEL, CARD_INTEL_ILKD, "Intel(R) Ironlake Desktop", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_ILKM, "Intel(R) Ironlake Mobile", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_SNBD, "Intel(R) Sandybridge Desktop", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_SNBM, "Intel(R) Sandybridge Mobile", DRIVER_INTEL_GMA3000, 1024}, - {HW_VENDOR_INTEL, CARD_INTEL_SNBS, "Intel(R) Sandybridge Server", DRIVER_INTEL_GMA3000, 1024}, - {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}, + {HW_VENDOR_INTEL, CARD_INTEL_ILKD, "Intel(R) HD Graphics", DRIVER_INTEL_GMA3000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_ILKM, "Intel(R) HD Graphics", DRIVER_INTEL_GMA3000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_SNBD, "Intel(R) HD Graphics 3000", DRIVER_INTEL_GMA3000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_SNBM, "Intel(R) HD Graphics 3000", DRIVER_INTEL_GMA3000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_SNBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_GMA3000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IVBD, "Intel(R) HD Graphics 4000", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IVBM, "Intel(R) HD Graphics 4000", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_IVBS, "Intel(R) HD Graphics Family", DRIVER_INTEL_HD4000, 1536}, + {HW_VENDOR_INTEL, CARD_INTEL_HWM, "Intel(R) HD Graphics 4600", DRIVER_INTEL_HD4000, 1536}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver,

1 0

Hugh McMaster : reg: Move duplicate /v, /ve and / va combination checks to wmain.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: 17d606a3b9f393fdf40ba69d6b591dea25656c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=17d606a3b9f393fdf40ba69d6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 6 05:32:16 2016 +0000 reg: Move duplicate /v, /ve and /va combination checks to wmain. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index ea77426..84818da 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -350,12 +350,6 @@ static int reg_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, { HKEY key; - if (value_name && value_empty) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - if (RegCreateKeyW(root, path, &key) != ERROR_SUCCESS) { output_message(STRING_INVALID_KEY); @@ -416,12 +410,6 @@ static int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name { HKEY key; - if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - if (!force) { BOOL ret; @@ -808,12 +796,6 @@ static int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, WCHAR newlineW[] = {'\n',0}; int ret; - if (value_name && value_empty) - { - output_message(STRING_INVALID_CMDLINE); - return 1; - } - if (RegOpenKeyExW(root, path, 0, KEY_READ, &key) != ERROR_SUCCESS) { output_message(STRING_CANNOT_FIND); @@ -990,6 +972,12 @@ int wmain(int argc, WCHAR *argvW[]) force = TRUE; } + if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + if (op == REG_ADD) ret = reg_add(root, path, value_name, value_empty, type, separator, data, force); else if (op == REG_DELETE)

1 0

Hugh McMaster : reg: Move duplicate strchrW() calls to wmain.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: f1bf0bfbc39a4503905b966b695ee8dc7008ce7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1bf0bfbc39a4503905b966b6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 6 05:31:45 2016 +0000 reg: Move duplicate strchrW() calls to wmain. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index b7ed312..6b4ad50 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -345,22 +345,18 @@ static BOOL sane_path(const WCHAR *key) return TRUE; } -static int reg_add(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, +static int reg_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, WCHAR *type, WCHAR separator, WCHAR *data, BOOL force) { - LPWSTR p; HKEY key; - p = strchrW(key_name,'\\'); - if (p) p++; - if (value_name && value_empty) { output_message(STRING_INVALID_CMDLINE); return 1; } - if (RegCreateKeyW(root, p, &key) != ERROR_SUCCESS) + if (RegCreateKeyW(root, path, &key) != ERROR_SUCCESS) { output_message(STRING_INVALID_KEY); return 1; @@ -415,15 +411,11 @@ static int reg_add(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_emp return 0; } -static int reg_delete(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, - BOOL value_all, BOOL force) +static int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, + BOOL value_empty, BOOL value_all, BOOL force) { - LPWSTR p; HKEY key; - p = strchrW(key_name,'\\'); - if (p) p++; - if ((value_name && value_empty) || (value_name && value_all) || (value_empty && value_all)) { output_message(STRING_INVALID_CMDLINE); @@ -451,7 +443,7 @@ static int reg_delete(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_ /* Delete subtree only if no /v* option is given */ if (!value_name && !value_empty && !value_all) { - if (RegDeleteTreeW(root,p)!=ERROR_SUCCESS) + if (RegDeleteTreeW(root, path) != ERROR_SUCCESS) { output_message(STRING_CANNOT_FIND); return 1; @@ -460,7 +452,7 @@ static int reg_delete(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_ return 0; } - if (RegOpenKeyW(root, p, &key) != ERROR_SUCCESS) + if (RegOpenKeyW(root, path, &key) != ERROR_SUCCESS) { output_message(STRING_CANNOT_FIND); return 1; @@ -809,9 +801,9 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) return 0; } -static int reg_query(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) +static int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, + BOOL value_empty, BOOL recurse) { - WCHAR *p; HKEY key; WCHAR newlineW[] = {'\n',0}; int ret; @@ -822,10 +814,7 @@ static int reg_query(HKEY root, WCHAR *key_name, WCHAR *value_name, BOOL value_e return 1; } - p = strchrW(key_name, '\\'); - if (p) p++; - - if (RegOpenKeyExW(root, p, 0, KEY_READ, &key) != ERROR_SUCCESS) + if (RegOpenKeyExW(root, path, 0, KEY_READ, &key) != ERROR_SUCCESS) { output_message(STRING_CANNOT_FIND); return 1; @@ -887,7 +876,7 @@ int wmain(int argc, WCHAR *argvW[]) { int i, op; BOOL show_op_help = FALSE; - WCHAR *key_name; + WCHAR *key_name, *path; HKEY root; static const WCHAR slashDW[] = {'/','d',0}; static const WCHAR slashFW[] = {'/','f',0}; @@ -951,6 +940,9 @@ int wmain(int argc, WCHAR *argvW[]) return 1; } + path = strchrW(key_name, '\\'); + if (path) path++; + if (op == REG_ADD) { WCHAR *value_name = NULL, *type = NULL, separator = '\0', *data = NULL; @@ -992,7 +984,7 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashFW)) force = TRUE; } - return reg_add(root, key_name, value_name, value_empty, type, separator, data, force); + return reg_add(root, path, value_name, value_empty, type, separator, data, force); } else if (op == REG_DELETE) { @@ -1016,7 +1008,7 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashFW)) force = TRUE; } - return reg_delete(root, key_name, value_name, value_empty, value_all, force); + return reg_delete(root, path, key_name, value_name, value_empty, value_all, force); } else if (op == REG_QUERY) { @@ -1038,7 +1030,7 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashSW)) recurse = TRUE; } - return reg_query(root, key_name, value_name, value_empty, recurse); + return reg_query(root, path, key_name, value_name, value_empty, recurse); } else {

1 0

Michael Stefaniuc : user32/tests: Use EqualRect() instead of open coding it.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: 4b26eef83c8f5742fb19840391ab5d415ed5a7d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b26eef83c8f5742fb1984039… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jun 6 11:15:14 2016 +0200 user32/tests: Use EqualRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/menu.c | 4 +--- dlls/user32/tests/msg.c | 3 +-- dlls/user32/tests/win.c | 16 ++++------------ 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index e56cdc3..250cba5 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -393,9 +393,7 @@ static void test_getmenubarinfo(void) ok(ret, "GetMenuBarInfo failed with error %d\n", GetLastError()); ret = GetMenuItemRect(hwnd, hmenu, 1, &rci); ok(ret, "GetMenuItemRect failed.\n"); - ok(mbi.rcBar.left == rci.left && mbi.rcBar.top == rci.top && - mbi.rcBar.bottom == rci.bottom && mbi.rcBar.right == rci.right, - "rcBar: Got %d,%d-%d,%d instead of %d,%d-%d,%d\n", + ok(EqualRect(&mbi.rcBar, &rci), "rcBar: Got %d,%d-%d,%d instead of %d,%d-%d,%d\n", mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, mbi.rcBar.bottom, rci.left, rci.top, rci.right, rci.bottom); ok(mbi.hMenu == hmenu, "hMenu: Got %p instead of %p\n", mbi.hMenu, hmenu); diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 52cf901..5ab639b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6499,8 +6499,7 @@ static void check_update_rgn( HWND hwnd, HRGN hrgn ) } GetRgnBox( update, &r1 ); GetUpdateRect( hwnd, &r2, FALSE ); - ok( r1.left == r2.left && r1.top == r2.top && r1.right == r2.right && r1.bottom == r2.bottom, - "Rectangles are different: %d,%d-%d,%d / %d,%d-%d,%d\n", + ok( EqualRect( &r1, &r2 ), "Rectangles are different: %d,%d-%d,%d / %d,%d-%d,%d\n", r1.left, r1.top, r1.right, r1.bottom, r2.left, r2.top, r2.right, r2.bottom ); DeleteObject( tmp ); diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 138a6f1..40685dc 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2461,9 +2461,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_child, hwnd2 , 1, 2, 3, 4, 0); ok(ret, "Got %d\n", ret); GetWindowRect(hwnd_child, &rc2); - ok(rc1.left == rc2.left && rc1.top == rc2.top && - rc1.right == rc2.right && rc1.bottom == rc2.bottom, - "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", + ok(EqualRect(&rc1, &rc2), "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", rc1.left, rc1.top, rc1.right, rc1.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom); check_active_state(hwnd2, hwnd2, hwnd2); @@ -2472,9 +2470,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd2, hwnd_child, 1, 2, 3, 4, 0); ok(ret, "Got %d\n", ret); GetWindowRect(hwnd2, &rc2); - ok(rc1.left == rc2.left && rc1.top == rc2.top && - rc1.right == rc2.right && rc1.bottom == rc2.bottom, - "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", + ok(EqualRect(&rc1, &rc2), "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", rc1.left, rc1.top, rc1.right, rc1.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom); check_active_state(hwnd2, hwnd2, hwnd2); @@ -2483,9 +2479,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_grandchild, hwnd_child2, 1, 2, 3, 4, 0); ok(ret, "Got %d\n", ret); GetWindowRect(hwnd_grandchild, &rc2); - ok(rc1.left == rc2.left && rc1.top == rc2.top && - rc1.right == rc2.right && rc1.bottom == rc2.bottom, - "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", + ok(EqualRect(&rc1, &rc2), "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", rc1.left, rc1.top, rc1.right, rc1.bottom, rc2.left, rc2.top, rc2.right, rc2.bottom); check_active_state(hwnd2, hwnd2, hwnd2); @@ -2520,9 +2514,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_child, hwnd_desktop, 0, 0, 0, 0, 0); ok(!ret, "Got %d\n", ret); GetWindowRect(hwnd_child, &rc2); - ok(rc1.top == rc2.top && rc1.left == rc2.left && - rc1.bottom == rc2.bottom && rc1.right == rc2.right, - "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", + ok(EqualRect(&rc1, &rc2), "(%d, %d, %d, %d) != (%d, %d, %d, %d)\n", rc1.top, rc1.left, rc1.bottom, rc1.right, rc2.top, rc2.left, rc2.bottom, rc2.right); check_active_state(hwnd2, hwnd2, hwnd2);

1 0

Hadrien Boizard : include: Add missing FILE_ATTRIBUTE flags.
by Alexandre Julliard June 6, 2016

June 6, 2016

Module: wine Branch: master Commit: 221b23bf48df2412bf54b83f57f00ae3203946e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=221b23bf48df2412bf54b83f5… Author: Hadrien Boizard <h.boizard(a)laposte.net> Date: Fri Jun 3 00:42:29 2016 +0200 include: Add missing FILE_ATTRIBUTE flags. Signed-off-by: Hadrien Boizard <h.boizard(a)laposte.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 5ece0f7..4e2d818 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -4823,6 +4823,10 @@ typedef struct _QUOTA_LIMITS_EX { #define FILE_ATTRIBUTE_OFFLINE 0x00001000 #define FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x00002000 #define FILE_ATTRIBUTE_ENCRYPTED 0x00004000 +#define FILE_ATTRIBUTE_INTEGRITY_STREAM 0x00008000 +#define FILE_ATTRIBUTE_VIRTUAL 0x00010000 +#define FILE_ATTRIBUTE_NO_SCRUB_DATA 0x00020000 +#define FILE_ATTRIBUTE_EA 0x00040000 /* File notification flags */ #define FILE_NOTIFY_CHANGE_FILE_NAME 0x00000001

1 0