wine-commits June 2018

wine-commits@winehq.org

1 participants
629 discussions

Michael Stefaniuc : rpcrt4/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: cc906096c3969980eed8195f6eedcff1ff0a1103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc906096c3969980eed8195f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jun 8 22:19:03 2018 +0200 rpcrt4/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/cstub.c | 2 +- dlls/rpcrt4/tests/rpc.c | 6 ++---- dlls/rpcrt4/tests/server.c | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 606107f..7bed308 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -596,7 +596,7 @@ static IPSFactoryBuffer *test_NdrDllGetClassObject(void) #undef VTBL_PROXY_TEST #undef VTBL_PROXY_TEST_NOT_ZERO - for (i = 0; i < sizeof(interfaces)/sizeof(interfaces[0]); i++) + for (i = 0; i < ARRAY_SIZE(interfaces); i++) ok( proxy_vtbl[i]->header.piid == interfaces[i], "wrong proxy %u iid %p/%p\n", i, proxy_vtbl[i]->header.piid, interfaces[i] ); diff --git a/dlls/rpcrt4/tests/rpc.c b/dlls/rpcrt4/tests/rpc.c index f026e99..c9f2a4b 100644 --- a/dlls/rpcrt4/tests/rpc.c +++ b/dlls/rpcrt4/tests/rpc.c @@ -149,10 +149,8 @@ static void TestDceErrorInqText (void) */ DWORD dwCount; - dwCount = FormatMessageA (FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, RPC_S_NOT_RPC_ERROR, 0, bufferInvalid, - sizeof(bufferInvalid)/sizeof(bufferInvalid[0]), NULL); + dwCount = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, + RPC_S_NOT_RPC_ERROR, 0, bufferInvalid, ARRAY_SIZE(bufferInvalid), NULL); /* A random sample of DceErrorInqText */ /* 0 is success */ diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index dfad1ed..b35b71b 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -313,7 +313,7 @@ void __cdecl s_get_number_array(int x[20], int *n) { int c[] = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9}; memcpy(x, c, sizeof(c)); - *n = sizeof(c)/sizeof(c[0]); + *n = ARRAY_SIZE(c); } int __cdecl s_sum_cs(cs_t *cs)

1 0

Michael Stefaniuc : webservices/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: c07f18fbf1bb985792539a0f3e8877525953f9a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c07f18fbf1bb985792539a0f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jun 8 22:19:02 2018 +0200 webservices/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/channel.c | 12 ++++++------ dlls/webservices/tests/msg.c | 2 +- dlls/webservices/tests/proxy.c | 8 ++++---- dlls/webservices/tests/reader.c | 20 ++++++++++---------- dlls/webservices/tests/url.c | 4 ++-- dlls/webservices/tests/writer.c | 38 +++++++++++++++++++------------------- 6 files changed, 42 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c07f18fbf1bb98579253…

1 0

Michael Stefaniuc : dinput/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: fb783bc636e823de4edc607915ae6712532b8182 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb783bc636e823de4edc6079… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jun 7 23:44:39 2018 +0200 dinput/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/device.c | 4 ++-- dlls/dinput/tests/dinput.c | 20 ++++++++++---------- dlls/dinput/tests/joystick.c | 8 +++----- dlls/dinput/tests/keyboard.c | 10 +++++----- 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 7494024..fa9b6f1 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -51,7 +51,7 @@ static const DIDATAFORMAT data_format = { sizeof(DIOBJECTDATAFORMAT), DIDF_ABSAXIS, 32, - sizeof(obj_data_format) / sizeof(obj_data_format[0]), + ARRAY_SIZE(obj_data_format), (LPDIOBJECTDATAFORMAT)obj_data_format }; @@ -94,7 +94,7 @@ static void test_object_info(IDirectInputDeviceA *device, HWND hwnd) ok(cnt == cnt1, "Enum count changed from %d to %d\n", cnt, cnt1); /* Testing EnumObjects with different types of device objects */ - for (type_index=0; type_index < sizeof(obj_types)/sizeof(obj_types[0]); type_index++) + for (type_index=0; type_index < ARRAY_SIZE(obj_types); type_index++) { hr = IDirectInputDevice_EnumObjects(device, enum_type_callback, &obj_types[type_index], obj_types[type_index]); ok(SUCCEEDED(hr), "EnumObjects() failed: %08x\n", hr); diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index a5f7c0c..7e2da9f 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -106,7 +106,7 @@ static void test_preinitialization(void) return; } - for (i = 0; i < sizeof(create_device_tests)/sizeof(create_device_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(create_device_tests); i++) { if (create_device_tests[i].pdev) pDID = (void *)0xdeadbeef; hr = IDirectInput_CreateDevice(pDI, create_device_tests[i].rguid, @@ -117,7 +117,7 @@ static void test_preinitialization(void) ok(pDID == NULL, "[%d] Output interface pointer is %p\n", i, pDID); } - for (i = 0; i < sizeof(enum_devices_tests)/sizeof(enum_devices_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(enum_devices_tests); i++) { hr = IDirectInput_EnumDevices(pDI, enum_devices_tests[i].dwDevType, enum_devices_tests[i].lpCallback, @@ -217,7 +217,7 @@ static void test_DirectInputCreateEx(void) return; } - for (i = 0; i < sizeof(invalid_param_list)/sizeof(invalid_param_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(invalid_param_list); i++) { if (invalid_param_list[i].ppdi) pUnk = (void *)0xdeadbeef; hr = pDirectInputCreateEx(invalid_param_list[i].hinst ? hInstance : NULL, @@ -230,7 +230,7 @@ static void test_DirectInputCreateEx(void) ok(pUnk == invalid_param_list[i].expected_ppdi, "[%d] Output interface pointer is %p\n", i, pUnk); } - for (i = 0; i < sizeof(no_interface_list)/sizeof(no_interface_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(no_interface_list); i++) { pUnk = (void *)0xdeadbeef; hr = pDirectInputCreateEx(hInstance, DIRECTINPUT_VERSION, no_interface_list[i], (void **)&pUnk, NULL); @@ -238,7 +238,7 @@ static void test_DirectInputCreateEx(void) ok(pUnk == (void *)0xdeadbeef, "[%d] Output interface pointer is %p\n", i, pUnk); } - for (i = 0; i < sizeof(iid_list)/sizeof(iid_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(iid_list); i++) { pUnk = NULL; hr = pDirectInputCreateEx(hInstance, DIRECTINPUT_VERSION, iid_list[i], (void **)&pUnk, NULL); @@ -249,9 +249,9 @@ static void test_DirectInputCreateEx(void) } /* Examine combinations of requested interfaces and version numbers. */ - for (i = 0; i < sizeof(directinput_version_list)/sizeof(directinput_version_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(directinput_version_list); i++) { - for (j = 0; j < sizeof(iid_list)/sizeof(iid_list[0]); j++) + for (j = 0; j < ARRAY_SIZE(iid_list); j++) { pUnk = NULL; hr = pDirectInputCreateEx(hInstance, directinput_version_list[i], iid_list[j], (void **)&pUnk, NULL); @@ -311,7 +311,7 @@ static void test_QueryInterface(void) hr = IDirectInput_QueryInterface(pDI, &IID_IUnknown, NULL); ok(hr == E_POINTER, "IDirectInput_QueryInterface returned 0x%08x\n", hr); - for (i = 0; i < sizeof(iid_list)/sizeof(iid_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(iid_list); i++) { pUnk = NULL; hr = IDirectInput_QueryInterface(pDI, iid_list[i], (void **)&pUnk); @@ -320,7 +320,7 @@ static void test_QueryInterface(void) if (pUnk) IUnknown_Release(pUnk); } - for (i = 0; i < sizeof(no_interface_list)/sizeof(no_interface_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(no_interface_list); i++) { pUnk = (void *)0xdeadbeef; hr = IDirectInput_QueryInterface(pDI, no_interface_list[i].riid, (void **)&pUnk); @@ -512,7 +512,7 @@ static void test_Initialize(void) hr = IDirectInput_Initialize(pDI, hInstance, 0xcafe); ok(hr == DIERR_OLDDIRECTINPUTVERSION, "IDirectInput_Initialize returned 0x%08x\n", hr); - for (i = 0; i < sizeof(directinput_version_list)/sizeof(directinput_version_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(directinput_version_list); i++) { hr = IDirectInput_Initialize(pDI, hInstance, directinput_version_list[i]); ok(hr == DI_OK, "IDirectInput_Initialize returned 0x%08x\n", hr); diff --git a/dlls/dinput/tests/joystick.c b/dlls/dinput/tests/joystick.c index b4ffba5..69e95d0 100644 --- a/dlls/dinput/tests/joystick.c +++ b/dlls/dinput/tests/joystick.c @@ -30,8 +30,6 @@ #include "wingdi.h" #include "dinput.h" -#define numObjects(x) (sizeof(x) / sizeof(x[0])) - typedef struct tagUserData { IDirectInputA *pDI; DWORD version; @@ -62,7 +60,7 @@ static const DIDATAFORMAT c_dfDIJoystickTest = { sizeof(DIOBJECTDATAFORMAT), DIDF_ABSAXIS, sizeof(DIJOYSTATE2), - numObjects(dfDIJoystickTest), + ARRAY_SIZE(dfDIJoystickTest), (LPDIOBJECTDATAFORMAT)dfDIJoystickTest }; @@ -178,7 +176,7 @@ static const struct effect_id static const struct effect_id* effect_from_guid(const GUID *guid) { unsigned int i; - for (i = 0; i < sizeof(effect_conversion) / sizeof(effect_conversion[0]); i++) + for (i = 0; i < ARRAY_SIZE(effect_conversion); i++) if (IsEqualGUID(guid, effect_conversion[i].guid)) return &effect_conversion[i]; return NULL; @@ -504,7 +502,7 @@ static BOOL CALLBACK EnumJoysticks(const DIDEVICEINSTANCEA *lpddi, void *pvRef) effect_data.eff.dwDuration = INFINITE; effect_data.eff.dwGain = DI_FFNOMINALMAX; effect_data.eff.dwTriggerButton = DIEB_NOTRIGGER; - effect_data.eff.cAxes = sizeof(axes) / sizeof(axes[0]); + effect_data.eff.cAxes = ARRAY_SIZE(axes); effect_data.eff.rgdwAxes = axes; effect_data.eff.rglDirection = direction; diff --git a/dlls/dinput/tests/keyboard.c b/dlls/dinput/tests/keyboard.c index 576a94c..59411cb 100644 --- a/dlls/dinput/tests/keyboard.c +++ b/dlls/dinput/tests/keyboard.c @@ -101,7 +101,7 @@ static void acquire_tests(IDirectInputA *pDI, HWND hwnd) df.dwObjSize = sizeof( DIOBJECTDATAFORMAT ); df.dwFlags = DIDF_RELAXIS; df.dwDataSize = sizeof( custom_state ); - df.dwNumObjs = sizeof( dodf )/sizeof( dodf[0] ); + df.dwNumObjs = ARRAY_SIZE(dodf); df.rgodf = dodf; hr = IDirectInput_CreateDevice(pDI, &GUID_SysKeyboard, &pKeyboard, NULL); @@ -139,7 +139,7 @@ static void acquire_tests(IDirectInputA *pDI, HWND hwnd) memset(custom_state, 0x56, sizeof(custom_state)); IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(custom_state), custom_state); - for (i = 0; i < sizeof(custom_state) / sizeof(custom_state[0]); i++) + for (i = 0; i < ARRAY_SIZE(custom_state); i++) ok(custom_state[i] == 0, "Should be zeroed, got 0x%08x\n", custom_state[i]); /* simulate some keyboard input */ @@ -160,7 +160,7 @@ static void acquire_tests(IDirectInputA *pDI, HWND hwnd) ok(SUCCEEDED(hr), "IDirectInputDevice_Acquire() failed: %08x\n", hr); hr = IDirectInputDevice_GetDeviceState(pKeyboard, sizeof(custom_state), custom_state); ok(SUCCEEDED(hr), "IDirectInputDevice_GetDeviceState failed: %08x\n", hr); - for (i = 0; i < sizeof(custom_state) / sizeof(custom_state[0]); i++) + for (i = 0; i < ARRAY_SIZE(custom_state); i++) ok(custom_state[i] == 0, "Should be zeroed, got 0x%08x\n", custom_state[i]); } keybd_event('Q', 0, KEYEVENTF_KEYUP, 0); @@ -316,7 +316,7 @@ static void test_dik_codes(IDirectInputA *dI, HWND hwnd, LANGID langid) HKL hkl, hkl_orig; MSG msg; - for (i = 0; i < sizeof(expected)/sizeof(expected[0]); i++) + for (i = 0; i < ARRAY_SIZE(expected); i++) { if (expected[i].langid == langid) { @@ -340,7 +340,7 @@ static void test_dik_codes(IDirectInputA *dI, HWND hwnd, LANGID langid) SetFocus(hwnd); pump_messages(); - for (i = 0; i < sizeof(key2dik_en)/sizeof(key2dik_en[0]); i++) + for (i = 0; i < ARRAY_SIZE(key2dik_en); i++) { BYTE kbd_state[256]; UINT n;

1 0

Michael Stefaniuc : dinput8/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: 91c3e8ebacd4fc133e73fd9f077930875279c6ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=91c3e8ebacd4fc133e73fd9f… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jun 7 23:44:38 2018 +0200 dinput8/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 12 ++++++------ dlls/dinput8/tests/dinput.c | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 2b06f62..aaeddd9 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -317,8 +317,8 @@ static void test_action_mapping(void) memset (&af, 0, sizeof(af)); af.dwSize = sizeof(af); af.dwActionSize = sizeof(DIACTIONA); - af.dwDataSize = 4 * sizeof(actionMapping) / sizeof(actionMapping[0]); - af.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); + af.dwDataSize = 4 * ARRAY_SIZE(actionMapping); + af.dwNumActions = ARRAY_SIZE(actionMapping); af.rgoAction = actionMapping; af.guidActionMap = ACTION_MAPPING_GUID; af.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */ @@ -357,8 +357,8 @@ static void test_action_mapping(void) hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, 0); ok (hr == DI_NOEFFECT, "SetActionMap should have no effect with no actions to map hr=%08x\n", hr); - af.dwDataSize = 4 * sizeof(actionMapping) / sizeof(actionMapping[0]); - af.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); + af.dwDataSize = 4 * ARRAY_SIZE(actionMapping); + af.dwNumActions = ARRAY_SIZE(actionMapping); /* test DIDSAM_NOUSER */ dps.diph.dwSize = sizeof(dps); @@ -448,8 +448,8 @@ static void test_save_settings(void) memset (&af, 0, sizeof(af)); af.dwSize = sizeof(af); af.dwActionSize = sizeof(DIACTIONA); - af.dwDataSize = 4 * sizeof(actions) / sizeof(actions[0]); - af.dwNumActions = sizeof(actions) / sizeof(actions[0]); + af.dwDataSize = 4 * ARRAY_SIZE(actions); + af.dwNumActions = ARRAY_SIZE(actions); af.rgoAction = actions; af.guidActionMap = mapping_guid; af.dwGenre = 0x01000000; /* DIVIRTUAL_DRIVING_RACE */ diff --git a/dlls/dinput8/tests/dinput.c b/dlls/dinput8/tests/dinput.c index e16542a..b093437 100644 --- a/dlls/dinput8/tests/dinput.c +++ b/dlls/dinput8/tests/dinput.c @@ -82,7 +82,7 @@ static void test_preinitialization(void) return; } - for (i = 0; i < sizeof(create_device_tests)/sizeof(create_device_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(create_device_tests); i++) { if (create_device_tests[i].pdev) pDID = (void *)0xdeadbeef; hr = IDirectInput8_CreateDevice(pDI, create_device_tests[i].rguid, @@ -93,7 +93,7 @@ static void test_preinitialization(void) ok(pDID == NULL, "[%d] Output interface pointer is %p\n", i, pDID); } - for (i = 0; i < sizeof(enum_devices_tests)/sizeof(enum_devices_tests[0]); i++) + for (i = 0; i < ARRAY_SIZE(enum_devices_tests); i++) { hr = IDirectInput8_EnumDevices(pDI, enum_devices_tests[i].dwDevType, enum_devices_tests[i].lpCallback, @@ -186,7 +186,7 @@ static void test_DirectInput8Create(void) IUnknown *pUnk; HRESULT hr; - for (i = 0; i < sizeof(invalid_param_list)/sizeof(invalid_param_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(invalid_param_list); i++) { if (invalid_param_list[i].ppdi) pUnk = (void *)0xdeadbeef; hr = DirectInput8Create(invalid_param_list[i].hinst ? hInstance : NULL, @@ -199,7 +199,7 @@ static void test_DirectInput8Create(void) ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); } - for (i = 0; i < sizeof(no_interface_list)/sizeof(no_interface_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(no_interface_list); i++) { pUnk = (void *)0xdeadbeef; hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, no_interface_list[i], (void **)&pUnk, NULL); @@ -207,7 +207,7 @@ static void test_DirectInput8Create(void) ok(pUnk == NULL, "[%d] Output interface pointer is %p\n", i, pUnk); } - for (i = 0; i < sizeof(iid_list)/sizeof(iid_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(iid_list); i++) { pUnk = NULL; hr = DirectInput8Create(hInstance, DIRECTINPUT_VERSION, iid_list[i], (void **)&pUnk, NULL); @@ -268,7 +268,7 @@ static void test_QueryInterface(void) hr = IDirectInput8_QueryInterface(pDI, &IID_IUnknown, NULL); ok(hr == E_POINTER, "IDirectInput8_QueryInterface returned 0x%08x\n", hr); - for (i = 0; i < sizeof(iid_list)/sizeof(iid_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(iid_list); i++) { pUnk = NULL; hr = IDirectInput8_QueryInterface(pDI, iid_list[i], (void **)&pUnk); @@ -277,7 +277,7 @@ static void test_QueryInterface(void) if (pUnk) { int j; - for (j = 0; j < sizeof(iid_list)/sizeof(iid_list[0]); j++) + for (j = 0; j < ARRAY_SIZE(iid_list); j++) { IUnknown *pUnk1 = NULL; hr = IDirectInput8_QueryInterface(pUnk, iid_list[j], (void **)&pUnk1); @@ -289,7 +289,7 @@ static void test_QueryInterface(void) } } - for (i = 0; i < sizeof(no_interface_list)/sizeof(no_interface_list[0]); i++) + for (i = 0; i < ARRAY_SIZE(no_interface_list); i++) { pUnk = (void *)0xdeadbeef; hr = IDirectInput8_QueryInterface(pDI, no_interface_list[i].riid, (void **)&pUnk); @@ -527,7 +527,7 @@ static void test_EnumDevicesBySemantics(void) memset (&diaf, 0, sizeof(diaf)); diaf.dwSize = sizeof(diaf); diaf.dwActionSize = sizeof(DIACTIONA); - diaf.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); + diaf.dwNumActions = ARRAY_SIZE(actionMapping); diaf.dwDataSize = 4 * diaf.dwNumActions; diaf.rgoAction = actionMapping; diaf.guidActionMap = ACTION_MAPPING_GUID;

1 0

Michael Stefaniuc : gdiplus/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: 741037ca4bf3805fa4193cca7c40a807a0ef979d URL: https://source.winehq.org/git/wine.git/?a=commit;h=741037ca4bf3805fa4193cca… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jun 7 23:44:36 2018 +0200 gdiplus/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/graphics.c | 10 +++---- dlls/gdiplus/tests/graphicspath.c | 58 +++++++++++++++++++-------------------- dlls/gdiplus/tests/image.c | 40 +++++++++++++-------------- 3 files changed, 54 insertions(+), 54 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=741037ca4bf3805fa419…

1 0

Michael Stefaniuc : d3dcompiler/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: 07277ae13247415508a961b5f62b3c353b842ce8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=07277ae13247415508a961b5… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jun 7 23:44:35 2018 +0200 d3dcompiler/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/asm.c | 27 ++++++++++++++------------- dlls/d3dcompiler_43/tests/blob.c | 18 +++++++++--------- dlls/d3dcompiler_43/tests/hlsl.c | 14 +++++++------- dlls/d3dcompiler_43/tests/reflection.c | 18 +++++++++--------- 4 files changed, 39 insertions(+), 38 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07277ae13247415508a9…

1 0

Michael Stefaniuc : advpack/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: 9cd82ad7ee86145a0eee82613639a8a2f2a83591 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cd82ad7ee86145a0eee8261… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jun 7 23:44:34 2018 +0200 advpack/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/tests/advpack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index d595876..8d7c5eb 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -134,8 +134,8 @@ static void delnode_test(void) /* Native DelNode apparently does not support relative paths, so we use absolute paths for testing */ - currDirLen = GetCurrentDirectoryA(sizeof(currDir) / sizeof(CHAR), currDir); - assert(currDirLen > 0 && currDirLen < sizeof(currDir) / sizeof(CHAR)); + currDirLen = GetCurrentDirectoryA(ARRAY_SIZE(currDir), currDir); + assert(currDirLen > 0 && currDirLen < ARRAY_SIZE(currDir)); if(currDir[currDirLen - 1] == '\\') currDir[--currDirLen] = 0;

1 0

Alistair Leslie-Hughes : include: Updated enum AutomationIdentifierType values.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: f604ffaae6da719cf489a8209330073bda0a28f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f604ffaae6da719cf489a820… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 8 00:10:32 2018 +0000 include: Updated enum AutomationIdentifierType values. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/uiautomationcoreapi.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h index 12c509f..1898fe9 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -45,7 +45,11 @@ enum AutomationIdentifierType AutomationIdentifierType_Pattern, AutomationIdentifierType_Event, AutomationIdentifierType_ControlType, - AutomationIdentifierType_TextAttribute + AutomationIdentifierType_TextAttribute, + AutomationIdentifierType_LandmarkType, + AutomationIdentifierType_Annotation, + AutomationIdentifierType_Changes, + AutomationIdentifierType_Style }; HRESULT WINAPI UiaGetReservedMixedAttributeValue(IUnknown **value);

1 0

Zebediah Figura : include: Add some WOW64 definitions.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: 4e5f16333489cce1fae4f1b4c8a4ea3fac007244 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e5f16333489cce1fae4f1b4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 6 13:30:16 2018 -0500 include: Add some WOW64 definitions. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 54bf11d..4492f86 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -995,7 +995,7 @@ typedef struct _LDT_ENTRY { unsigned BaseHi : 8; } Bits; } HighWord; -} LDT_ENTRY, *PLDT_ENTRY; +} LDT_ENTRY, *PLDT_ENTRY, WOW64_LDT_ENTRY, *PWOW64_LDT_ENTRY; /* x86-64 context definitions */ #if defined(__x86_64__) @@ -2112,6 +2112,74 @@ typedef CONTEXT *PCONTEXT; NTSYSAPI void WINAPI RtlCaptureContext(CONTEXT*); +#define WOW64_CONTEXT_i386 0x00010000 +#define WOW64_CONTEXT_i486 0x00010000 +#define WOW64_CONTEXT_CONTROL (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000001)) +#define WOW64_CONTEXT_INTEGER (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000002)) +#define WOW64_CONTEXT_SEGMENTS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000004)) +#define WOW64_CONTEXT_FLOATING_POINT (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000008)) +#define WOW64_CONTEXT_DEBUG_REGISTERS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000010)) +#define WOW64_CONTEXT_EXTENDED_REGISTERS (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000020)) +#define WOW64_CONTEXT_FULL (WOW64_CONTEXT_CONTROL | WOW64_CONTEXT_INTEGER | WOW64_CONTEXT_SEGMENTS) +#define WOW64_CONTEXT_ALL (WOW64_CONTEXT_CONTROL | WOW64_CONTEXT_INTEGER | \ + WOW64_CONTEXT_SEGMENTS | WOW64_CONTEXT_FLOATING_POINT | \ + WOW64_CONTEXT_DEBUG_REGISTERS | WOW64_CONTEXT_EXTENDED_REGISTERS) + +#define WOW64_CONTEXT_XSTATE (WOW64_CONTEXT_i386 | __MSABI_LONG(0x00000040)) + +#define WOW64_CONTEXT_EXCEPTION_ACTIVE 0x08000000 +#define WOW64_CONTEXT_SERVICE_ACTIVE 0x10000000 +#define WOW64_CONTEXT_EXCEPTION_REQUEST 0x40000000 +#define WOW64_CONTEXT_EXCEPTION_REPORTING 0x80000000 + +#define WOW64_SIZE_OF_80387_REGISTERS 80 +#define WOW64_MAXIMUM_SUPPORTED_EXTENSION 512 + +typedef struct _WOW64_FLOATING_SAVE_AREA +{ + DWORD ControlWord; + DWORD StatusWord; + DWORD TagWord; + DWORD ErrorOffset; + DWORD ErrorSelector; + DWORD DataOffset; + DWORD DataSelector; + BYTE RegisterArea[WOW64_SIZE_OF_80387_REGISTERS]; + DWORD Cr0NpxState; +} WOW64_FLOATING_SAVE_AREA, *PWOW64_FLOATING_SAVE_AREA; + +#include "pshpack4.h" +typedef struct _WOW64_CONTEXT +{ + DWORD ContextFlags; + DWORD Dr0; + DWORD Dr1; + DWORD Dr2; + DWORD Dr3; + DWORD Dr6; + DWORD Dr7; + WOW64_FLOATING_SAVE_AREA FloatSave; + DWORD SegGs; + DWORD SegFs; + DWORD SegEs; + DWORD SegDs; + DWORD Edi; + DWORD Esi; + DWORD Ebx; + DWORD Edx; + DWORD Ecx; + DWORD Eax; + DWORD Ebp; + DWORD Eip; + DWORD SegCs; + DWORD EFlags; + DWORD Esp; + DWORD SegSs; + BYTE ExtendedRegisters[WOW64_MAXIMUM_SUPPORTED_EXTENSION]; +} WOW64_CONTEXT, *PWOW64_CONTEXT; +#include "poppack.h" + + /* * Product types */

1 0

Dmitry Timoshkov : schedsvc: Add support for running missed tasks at the service start.
by Alexandre Julliard 11 Jun '18

11 Jun '18

Module: wine Branch: master Commit: 8d540ec7cfebf12c088dc2733566d498dbee4977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d540ec7cfebf12c088dc273… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Jun 8 15:43:55 2018 +0800 schedsvc: Add support for running missed tasks at the service start. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 24 ++++++++++++++++++++++++ dlls/schedsvc/schedsvc_private.h | 1 + dlls/schedsvc/svc_main.c | 1 + 3 files changed, 26 insertions(+) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index b5b8317..f6ea0f0 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -1039,6 +1039,30 @@ void check_task_time(void) LeaveCriticalSection(&at_job_list_section); } +void check_missed_task_time(void) +{ + FILETIME current_ft, last_ft; + struct job_t *job; + + GetSystemTimeAsFileTime(&current_ft); + FileTimeToLocalFileTime(&current_ft, &current_ft); + + EnterCriticalSection(&at_job_list_section); + + LIST_FOR_EACH_ENTRY(job, &at_job_list, struct job_t, entry) + { + if (SystemTimeToFileTime(&job->data.last_runtime, &last_ft)) + { + if (job_runs_at(job, &last_ft, &current_ft)) + { + run_job(job); + } + } + } + + LeaveCriticalSection(&at_job_list_section); +} + void remove_job(const WCHAR *name) { struct job_t *job; diff --git a/dlls/schedsvc/schedsvc_private.h b/dlls/schedsvc/schedsvc_private.h index 10892d5..117c6f5 100644 --- a/dlls/schedsvc/schedsvc_private.h +++ b/dlls/schedsvc/schedsvc_private.h @@ -31,6 +31,7 @@ void update_process_status(DWORD pid) DECLSPEC_HIDDEN; BOOL get_next_runtime(LARGE_INTEGER *rt) DECLSPEC_HIDDEN; void check_task_time(void) DECLSPEC_HIDDEN; void load_at_tasks(void) DECLSPEC_HIDDEN; +void check_missed_task_time(void) DECLSPEC_HIDDEN; static inline WCHAR *heap_strdupW(const WCHAR *src) { diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 2bba674..8e23a04 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -54,6 +54,7 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) TRACE("Starting...\n"); load_at_tasks(); + check_missed_task_time(); htimer = CreateWaitableTimerW(NULL, FALSE, NULL); if (htimer == NULL)

1 0

← Newer
1
...
46
47
48
49
50
51
52
...
63
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 June 2018