August 2012 - Wine-Commits - list.winehq.org

Marek Chmiel : dssenh/tests: Key length tests for the DSSENH cryptographic service provider.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 01e937d49a1d0d4aedfeb308951bfa48b29b0ff9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01e937d49a1d0d4aedfeb3089… Author: Marek Chmiel <kcmark(a)gmail.com> Date: Thu Jun 28 21:31:37 2012 -0500 dssenh/tests: Key length tests for the DSSENH cryptographic service provider. --- dlls/dssenh/tests/dssenh.c | 218 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 218 insertions(+), 0 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 332b865..0c37c91 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -179,7 +179,225 @@ static void test_acquire_context(void) "Expected NTE_EXISTS, got %08x\n", GetLastError()); } +struct keylength_test { + ALG_ID algid; + DWORD flags; + BOOL expectedResult; + DWORD expectedError; + BOOL brokenResult; + DWORD brokenError; +}; + +static const struct keylength_test baseDSS_keylength[] = { + /* AT_KEYEXCHANGE is not supported by the base DSS provider */ + {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_KEYEXCHANGE, 512 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ + {AT_KEYEXCHANGE, 1024 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ + {AT_KEYEXCHANGE, 1088 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS},/* WinNT4 and Win2k */ + /* min 512 max 1024 increment by 64 */ + {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {AT_SIGNATURE, 512 << 16, TRUE}, + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 768 << 16, TRUE}, + {AT_SIGNATURE, 1024 << 16, TRUE}, + {AT_SIGNATURE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, + /* CALG_DH_EPHEM is not supported by the base DSS provider */ + {CALG_DH_EPHEM, 448 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_EPHEM, 512 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ + {CALG_DH_EPHEM, 1024 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ + {CALG_DH_EPHEM, 1088 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + /* CALG_DH_SF is not supported by the base DSS provider */ + {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_SF, 512 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ + {CALG_DH_SF, 1024 << 16, FALSE, NTE_BAD_ALGID, TRUE}, /* success on WinNT4 */ + {CALG_DH_SF, 1088 << 16, FALSE, NTE_BAD_ALGID, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + /* min 512 max 1024, increment by 64 */ + {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DSS_SIGN, 512 << 16, TRUE}, + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 768 << 16, TRUE}, + {CALG_DSS_SIGN, 1024 << 16, TRUE}, + {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} +}; + +static const struct keylength_test dssDH_keylength[] = { + /* min 512 max 1024, increment by 64 */ + {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {AT_KEYEXCHANGE, 512 << 16, TRUE}, + {AT_KEYEXCHANGE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_KEYEXCHANGE, 768 << 16, TRUE}, + {AT_KEYEXCHANGE, 1024 << 16, TRUE}, + {AT_KEYEXCHANGE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, + {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {AT_SIGNATURE, 512 << 16, TRUE}, + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 768 << 16, TRUE}, + {AT_SIGNATURE, 1024 << 16, TRUE}, + {AT_SIGNATURE, 1088 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_EPHEM, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_EPHEM, 512 << 16, TRUE}, + {CALG_DH_EPHEM, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_EPHEM, 768 << 16, TRUE}, + {CALG_DH_EPHEM, 1024 << 16, TRUE}, + {CALG_DH_EPHEM, 1088 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_SF, 512 << 16, TRUE}, + {CALG_DH_SF, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_SF, 768 << 16, TRUE}, + {CALG_DH_SF, 1024 << 16, TRUE}, + {CALG_DH_SF, 1088 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DSS_SIGN, 512 << 16, TRUE}, + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 768 << 16, TRUE}, + {CALG_DSS_SIGN, 1024 << 16, TRUE}, + {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} +}; + +static const struct keylength_test dssENH_keylength[] = { + /* min 512 max 1024 (AT_KEYEXCHANGE max 4096), increment by 64*/ + {AT_KEYEXCHANGE, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {AT_KEYEXCHANGE, 512 << 16, TRUE}, + {AT_KEYEXCHANGE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_KEYEXCHANGE, 768 << 16, TRUE}, + {AT_KEYEXCHANGE, 1024 << 16, TRUE}, + {AT_KEYEXCHANGE, 1088 << 16, TRUE}, + {AT_KEYEXCHANGE, 2048 << 16, TRUE}, + /* Keylength too large - test bot timeout. + {AT_KEYEXCHANGE, 3072 << 16, TRUE}, + {AT_KEYEXCHANGE, 4096 << 16, TRUE}, */ + {AT_KEYEXCHANGE, 4160 << 16, FALSE, NTE_BAD_FLAGS}, + {AT_SIGNATURE, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {AT_SIGNATURE, 512 << 16, TRUE}, + {AT_SIGNATURE, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {AT_SIGNATURE, 768 << 16, TRUE}, + {AT_SIGNATURE, 1024 << 16, TRUE}, + {AT_SIGNATURE, 1032 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_EPHEM, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_EPHEM, 512 << 16, TRUE}, + {CALG_DH_EPHEM, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_EPHEM, 768 << 16, TRUE}, + {CALG_DH_EPHEM, 1024 << 16, TRUE}, + {CALG_DH_EPHEM, 1040 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_SF, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DH_SF, 512 << 16, TRUE}, + {CALG_DH_SF, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DH_SF, 768 << 16, TRUE}, + {CALG_DH_SF, 1024 << 16, TRUE}, + {CALG_DH_SF, 1032 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DSS_SIGN, 448 << 16, FALSE, NTE_BAD_FLAGS}, + {CALG_DSS_SIGN, 512 << 16, TRUE}, + {CALG_DSS_SIGN, 513 << 16, FALSE, NTE_FAIL, FALSE, NTE_BAD_FLAGS}, /* WinNT4 and Win2k */ + {CALG_DSS_SIGN, 768 << 16, TRUE}, + {CALG_DSS_SIGN, 1024 << 16, TRUE}, + {CALG_DSS_SIGN, 1088 << 16, FALSE, NTE_BAD_FLAGS} +}; + +static void test_keylength_array(HCRYPTPROV hProv,const struct keylength_test *tests, int testLen) +{ + HCRYPTKEY key; + BOOL result; + int i; + + for (i = 0; i < testLen; i++) + { + SetLastError(0xdeadbeef); + result = CryptGenKey(hProv, tests[i].algid, tests[i].flags, &key); + + /* success */ + if(tests[i].expectedResult) + { + ok(result, "Expected a key, got %08x\n", GetLastError()); + result = CryptDestroyKey(key); + ok(result, "Expected no errors.\n"); + } + else + { /* error but success on older system */ + if(tests[i].brokenResult) + ok((!result && GetLastError() == tests[i].expectedError) || + broken(result), "Expected a key, got %x.\n", GetLastError()); + else + { + /* error */ + if(!tests[i].brokenError) + ok(!result && GetLastError() == tests[i].expectedError, + "Expected a key, got %x.\n", GetLastError()); + + /* error but different error on older system */ + else + ok(!result && (GetLastError() == tests[i].expectedError || + broken(GetLastError() == tests[i].brokenError)), + "Expected a key, got %x.\n", GetLastError()); + } + } + } +} + +#define TESTLEN(x) (sizeof(x) / sizeof((x)[0])) + +static void test_keylength(void) +{ + HCRYPTPROV hProv = 0; + BOOL result; + + /* acquire base dss provider */ + result = CryptAcquireContextA( + &hProv, NULL, MS_DEF_DSS_PROV_A, PROV_DSS, CRYPT_VERIFYCONTEXT); + if(!result) + { + skip("DSSENH is currently not available, skipping key length tests.\n"); + return; + } + ok(result, "Expected no errors.\n"); + + /* perform keylength tests */ + test_keylength_array(hProv, baseDSS_keylength, TESTLEN(baseDSS_keylength)); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of CSP provider.\n"); + + /* acquire diffie hellman dss provider */ + result = CryptAcquireContextA( + &hProv, NULL, MS_DEF_DSS_DH_PROV, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); + ok(result, "Expected no errors.\n"); + + /* perform keylength tests */ + test_keylength_array(hProv, dssDH_keylength, TESTLEN(dssDH_keylength)); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of CSP provider.\n"); + + /* acquire enhanced dss provider */ + SetLastError(0xdeadbeef); + result = CryptAcquireContextA( + &hProv, NULL, MS_ENH_DSS_DH_PROV, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); + if(!result && GetLastError() == NTE_KEYSET_NOT_DEF) + { + win_skip("DSSENH and Schannel provider is broken on WinNT4\n"); + return; + } + ok(result, "Expected no errors.\n"); + + /* perform keylength tests */ + test_keylength_array(hProv, dssENH_keylength, TESTLEN(dssENH_keylength)); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of CSP provider.\n"); + + /* acquire schannel dss provider */ + result = CryptAcquireContextA( + &hProv, NULL, MS_DEF_DH_SCHANNEL_PROV, PROV_DH_SCHANNEL, CRYPT_VERIFYCONTEXT); + ok(result, "Expected no errors.\n"); + + /* perform keylength tests */ + test_keylength_array(hProv, dssENH_keylength, TESTLEN(dssENH_keylength)); + + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of CSP provider.\n"); +} + START_TEST(dssenh) { test_acquire_context(); + test_keylength(); }

1 0

Lucas Zawacki : dinput/tests: Tests for IDirectInputJoyConfig8_GetConfig.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: dbc10ef93756954a8fc218c77f1ec3d26565ee3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbc10ef93756954a8fc218c77… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Aug 13 20:36:55 2012 -0300 dinput/tests: Tests for IDirectInputJoyConfig8_GetConfig. --- dlls/dinput/tests/dinput.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ include/dinputd.h | 2 ++ 2 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index 1cdc90b..c5386d6 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -22,6 +22,7 @@ #include <initguid.h> #include <windows.h> #include <dinput.h> +#include <dinputd.h> #include "wine/test.h" @@ -562,6 +563,48 @@ static void test_RunControlPanel(void) IDirectInput_Release(pDI); } +static void test_DirectInputJoyConfig8(void) +{ + IDirectInputA *pDI; + IDirectInputDeviceA *pDID; + IDirectInputJoyConfig8 *pDIJC; + DIJOYCONFIG info; + HRESULT hr; + int i; + + hr = DirectInputCreateA(hInstance, DIRECTINPUT_VERSION, &pDI, NULL); + if (FAILED(hr)) + { + win_skip("Failed to instantiate a IDirectInputA instance: 0x%08x\n", hr); + return; + } + + hr = IDirectInput_QueryInterface(pDI, &IID_IDirectInputJoyConfig8, (void **)&pDIJC); + if (FAILED(hr)) + { + win_skip("Failed to instantiate a IDirectInputJoyConfig8 instance: 0x%08x\n", hr); + return; + } + + info.dwSize = sizeof(info); + hr = DI_OK; + i = 0; + + /* Enumerate all connected joystick GUIDs and try to create the respective devices */ + for (i = 0; SUCCEEDED(hr); i++) + { + hr = IDirectInputJoyConfig8_GetConfig(pDIJC, i, &info, DIJC_GUIDINSTANCE); + + todo_wine ok (hr == DI_OK || hr == DIERR_NOMOREITEMS, + "IDirectInputJoyConfig8_GetConfig returned 0x%08x\n", hr); + + if (SUCCEEDED(hr)) + todo_wine ok (SUCCEEDED(IDirectInput_CreateDevice(pDI, &info.guidInstance, &pDID, NULL)), + "IDirectInput_CreateDevice failed with guid from GetConfig hr = 0x%08x\n", hr); + } + +} + START_TEST(dinput) { HMODULE dinput_mod = GetModuleHandleA("dinput.dll"); @@ -579,5 +622,6 @@ START_TEST(dinput) test_GetDeviceStatus(); test_Initialize(); test_RunControlPanel(); + test_DirectInputJoyConfig8(); CoUninitialize(); } diff --git a/include/dinputd.h b/include/dinputd.h index ac24a2c..9c3b435 100644 --- a/include/dinputd.h +++ b/include/dinputd.h @@ -44,6 +44,8 @@ typedef BOOL (CALLBACK *LPDIJOYTYPECALLBACK)(LPCWSTR, LPVOID); #define JOY_POVVAL_LEFT 2 #define JOY_POVVAL_RIGHT 3 +#define DIERR_NOMOREITEMS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, ERROR_NO_MORE_ITEMS) + typedef struct joypos_tag { DWORD dwX;

1 0

Lucas Zawacki : joy.cpl: Correct misplaced elements when using high DPIs.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: fc944144e36b7bc9e0644504a5b6d87c99dcf8f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc944144e36b7bc9e0644504a… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Aug 13 20:36:54 2012 -0300 joy.cpl: Correct misplaced elements when using high DPIs. --- dlls/joy.cpl/joy.h | 53 +++++++++++++++++++------------------ dlls/joy.cpl/main.c | 71 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 78 insertions(+), 46 deletions(-) diff --git a/dlls/joy.cpl/joy.h b/dlls/joy.cpl/joy.h index e40a71b..16d7a0b 100644 --- a/dlls/joy.cpl/joy.h +++ b/dlls/joy.cpl/joy.h @@ -50,6 +50,13 @@ struct Joystick { #define TEST_MAX_BUTTONS 32 #define TEST_MAX_AXES 4 +struct Graphics { + HWND hwnd; + HWND buttons[TEST_MAX_BUTTONS]; + HWND axes[TEST_MAX_AXES]; + HWND ff_axis; +}; + struct JoystickData { IDirectInput8W *di; struct Joystick *joysticks; @@ -57,9 +64,7 @@ struct JoystickData { int num_ff; int cur_joystick; int chosen_joystick; - HWND buttons[TEST_MAX_BUTTONS]; - HWND axes[TEST_MAX_AXES]; - HWND ff_axis; + struct Graphics graphics; BOOL stop; }; @@ -86,36 +91,32 @@ struct JoystickData { #define IDC_TESTGROUPZRZ 2007 #define IDC_TESTGROUPPOV 2008 -#define IDC_JOYSTICKBUTTON 3000 -#define IDC_JOYSTICKAXES 4000 - #define IDC_FFSELECTCOMBO 2009 #define IDC_FFEFFECTLIST 2010 -#define IDC_FFAXIS 2011 /* constants */ #define TEST_POLL_TIME 100 #define TEST_BUTTON_COL_MAX 8 -#define TEST_BUTTON_X 15 -#define TEST_BUTTON_Y 200 -#define TEST_NEXT_BUTTON_X 45 -#define TEST_NEXT_BUTTON_Y 40 -#define TEST_BUTTON_SIZE_X 30 -#define TEST_BUTTON_SIZE_Y 25 - -#define TEST_AXIS_X 65 -#define TEST_AXIS_Y 98 -#define TEST_NEXT_AXIS_X 115 -#define TEST_AXIS_SIZE_X 5 -#define TEST_AXIS_SIZE_Y 5 -#define TEST_AXIS_MIN -40 -#define TEST_AXIS_MAX 40 - -#define FF_AXIS_X 373 -#define FF_AXIS_Y 98 -#define FF_AXIS_SIZE_X 5 -#define FF_AXIS_SIZE_Y 5 +#define TEST_BUTTON_X 8 +#define TEST_BUTTON_Y 122 +#define TEST_NEXT_BUTTON_X 30 +#define TEST_NEXT_BUTTON_Y 25 +#define TEST_BUTTON_SIZE_X 20 +#define TEST_BUTTON_SIZE_Y 18 + +#define TEST_AXIS_X 43 +#define TEST_AXIS_Y 60 +#define TEST_NEXT_AXIS_X 77 +#define TEST_AXIS_SIZE_X 3 +#define TEST_AXIS_SIZE_Y 3 +#define TEST_AXIS_MIN -25 +#define TEST_AXIS_MAX 25 + +#define FF_AXIS_X 248 +#define FF_AXIS_Y 60 +#define FF_AXIS_SIZE_X 3 +#define FF_AXIS_SIZE_Y 3 #define FF_PLAY_TIME 2*DI_SECONDS #define FF_PERIOD_TIME FF_PLAY_TIME/4 diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 54771b0..354dfd7 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -166,6 +166,9 @@ static INT_PTR CALLBACK list_dlgproc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM SendDlgItemMessageW(hwnd, IDC_JOYSTICKLIST, LB_ADDSTRING, 0, (LPARAM) joy->instance.tszInstanceName); } + /* Store the hwnd to be used with MapDialogRect for unit conversions */ + data->graphics.hwnd = hwnd; + return TRUE; } @@ -260,7 +263,7 @@ static DWORD WINAPI input_thread(void *param) /* Indicate pressed buttons */ for (i = 0; i < data->joysticks[data->chosen_joystick].num_buttons; i++) if (state.rgbButtons[i]) - SendMessageW(data->buttons[i], BM_SETSTATE, TRUE, 0); + SendMessageW(data->graphics.buttons[i], BM_SETSTATE, TRUE, 0); /* Indicate axis positions, axes showing are hardcoded for now */ axes_pos[0][0] = state.lX; @@ -281,16 +284,21 @@ static DWORD WINAPI input_thread(void *param) } for (i = 0; i < TEST_MAX_AXES; i++) - SetWindowPos(data->axes[i], 0, - TEST_AXIS_X + TEST_NEXT_AXIS_X*i + axes_pos[i][0], - TEST_AXIS_Y + axes_pos[i][1], - 0, 0, SWP_NOZORDER | SWP_NOSIZE); + { + RECT r; + + r.left = (TEST_AXIS_X + TEST_NEXT_AXIS_X*i + axes_pos[i][0]); + r.top = (TEST_AXIS_Y + axes_pos[i][1]); + MapDialogRect(data->graphics.hwnd, &r); + + SetWindowPos(data->graphics.axes[i], 0, r.left, r.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE); + } Sleep(TEST_POLL_TIME); /* Reset button state */ for (i = 0; i < data->joysticks[data->chosen_joystick].num_buttons; i++) - SendMessageW(data->buttons[i], BM_SETSTATE, FALSE, 0); + SendMessageW(data->graphics.buttons[i], BM_SETSTATE, FALSE, 0); } return 0; @@ -306,7 +314,7 @@ static void test_handle_joychange(HWND hwnd, struct JoystickData *data) /* Enable only buttons present in the device */ for (i = 0; i < TEST_MAX_BUTTONS; i++) - ShowWindow(data->buttons[i], i <= data->joysticks[data->chosen_joystick].num_buttons); + ShowWindow(data->graphics.buttons[i], i <= data->joysticks[data->chosen_joystick].num_buttons); } /********************************************************************* @@ -331,17 +339,24 @@ static void draw_joystick_buttons(HWND hwnd, struct JoystickData* data) for (i = 0; i < TEST_MAX_BUTTONS; i++) { + RECT r; + if ((i % TEST_BUTTON_COL_MAX) == 0 && i != 0) { row += 1; col = 0; } + r.left = (TEST_BUTTON_X + TEST_NEXT_BUTTON_X*col); + r.top = (TEST_BUTTON_Y + TEST_NEXT_BUTTON_Y*row); + r.right = r.left + TEST_BUTTON_SIZE_X; + r.bottom = r.top + TEST_BUTTON_SIZE_Y; + MapDialogRect(hwnd, &r); + button_number_to_wchar(i + 1, button_label); - data->buttons[i] = CreateWindowW(button_class, button_label, WS_CHILD, - TEST_BUTTON_X + TEST_NEXT_BUTTON_X*col, TEST_BUTTON_Y + TEST_NEXT_BUTTON_Y*row, - TEST_BUTTON_SIZE_X, TEST_BUTTON_SIZE_Y, + data->graphics.buttons[i] = CreateWindowW(button_class, button_label, WS_CHILD, + r.left, r.top, r.right - r.left, r.bottom - r.top, hwnd, NULL, NULL, hinst); col += 1; @@ -360,13 +375,19 @@ static void draw_joystick_axes(HWND hwnd, struct JoystickData* data) for (i = 0; i < TEST_MAX_AXES; i++) { + RECT r; /* Set axis box name */ SetWindowTextW(GetDlgItem(hwnd, axes_idc[i]), axes_names[i]); - data->axes[i] = CreateWindowW( button_class, NULL, WS_CHILD | WS_VISIBLE, - TEST_AXIS_X + TEST_NEXT_AXIS_X*i, TEST_AXIS_Y, - TEST_AXIS_SIZE_X, TEST_AXIS_SIZE_Y, - hwnd, (HMENU) IDC_JOYSTICKAXES + i, NULL, hinst); + r.left = (TEST_AXIS_X + TEST_NEXT_AXIS_X*i); + r.top = TEST_AXIS_Y; + r.right = r.left + TEST_AXIS_SIZE_X; + r.bottom = r.top + TEST_AXIS_SIZE_Y; + MapDialogRect(hwnd, &r); + + data->graphics.axes[i] = CreateWindowW( button_class, NULL, WS_CHILD | WS_VISIBLE, + r.left, r.top, r.right - r.left, r.bottom - r.top, + hwnd, NULL, NULL, hinst); } } @@ -452,12 +473,18 @@ static void draw_ff_axis(HWND hwnd, struct JoystickData *data) { HINSTANCE hinst = (HINSTANCE) GetWindowLongPtrW(hwnd, GWLP_HINSTANCE); static WCHAR button_class[] = {'B','u','t','t','o','n','\0'}; + RECT r; + + r.left = FF_AXIS_X; + r.top = FF_AXIS_Y; + r.right = r.left + FF_AXIS_SIZE_X; + r.bottom = r.top + FF_AXIS_SIZE_Y; + MapDialogRect(hwnd, &r); /* Draw direction axis */ - data->ff_axis = CreateWindowW( button_class, NULL, WS_CHILD | WS_VISIBLE, - FF_AXIS_X, FF_AXIS_Y, - FF_AXIS_SIZE_X, FF_AXIS_SIZE_Y, - hwnd, (HMENU) IDC_FFAXIS, NULL, hinst); + data->graphics.ff_axis = CreateWindowW( button_class, NULL, WS_CHILD | WS_VISIBLE, + r.left, r.top, r.right - r.left, r.bottom - r.top, + hwnd, NULL, NULL, hinst); } static void initialize_effects_list(HWND hwnd, struct Joystick* joy) @@ -508,6 +535,7 @@ static DWORD WINAPI ff_input_thread(void *param) int chosen_effect = joy->chosen_effect; DIEFFECT *dieffect; DWORD flags = DIEP_AXES | DIEP_DIRECTION | DIEP_NORESTART; + RECT r; /* Skip this if we have no effects */ if (joy->num_effects == 0 || chosen_effect < 0) continue; @@ -519,8 +547,11 @@ static DWORD WINAPI ff_input_thread(void *param) dieffect->rgdwAxes[0] = state.lX; dieffect->rgdwAxes[1] = state.lY; - SetWindowPos(data->ff_axis, 0, FF_AXIS_X + state.lX, FF_AXIS_Y + state.lY, - 0, 0, SWP_NOZORDER | SWP_NOSIZE); + r.left = FF_AXIS_X + state.lX; + r.top = FF_AXIS_Y + state.lY; + MapDialogRect(data->graphics.hwnd, &r); + + SetWindowPos(data->graphics.ff_axis, 0, r.left, r.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE); for (i=0; i < joy->num_buttons; i++) if (state.rgbButtons[i])

1 0

Michael Stefaniuc : dsound: Avoid a TRUE:FALSE conditional expression.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: b18bc659d63e32c9d14fffe004416beab73293d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b18bc659d63e32c9d14fffe00… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 13 11:43:59 2012 +0200 dsound: Avoid a TRUE:FALSE conditional expression. --- dlls/dsound/buffer.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index caf1f86..cf4d2ec 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -141,7 +141,7 @@ static inline IDirectSoundBufferImpl *impl_from_IDirectSoundBuffer8(IDirectSound static inline BOOL is_primary_buffer(IDirectSoundBufferImpl *This) { - return This->dsbd.dwFlags & DSBCAPS_PRIMARYBUFFER ? TRUE : FALSE; + return (This->dsbd.dwFlags & DSBCAPS_PRIMARYBUFFER) != 0; } static HRESULT WINAPI IDirectSoundBufferImpl_SetFormat(IDirectSoundBuffer8 *iface,

1 0

Michael Stefaniuc : setupapi: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 4d28aedaf8180e9eddaf3cfb23c7eec333eb2fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d28aedaf8180e9eddaf3cfb2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Aug 9 09:34:54 2012 +0200 setupapi: Avoid TRUE:FALSE conditional expressions. --- dlls/setupapi/setupcab.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/setupcab.c b/dlls/setupapi/setupcab.c index 156f20c..ea1bc99 100644 --- a/dlls/setupapi/setupcab.c +++ b/dlls/setupapi/setupcab.c @@ -194,7 +194,7 @@ static INT_PTR CDECL sc_cb_open(char *pszFile, int oflag, int pmode) sa.nLength = sizeof( SECURITY_ATTRIBUTES ); sa.lpSecurityDescriptor = NULL; - sa.bInheritHandle = (ioflag & _O_NOINHERIT) ? FALSE : TRUE; + sa.bInheritHandle = !(ioflag & _O_NOINHERIT); ret = (INT_PTR) CreateFileA(pszFile, ioflag, sharing, &sa, creation, FILE_ATTRIBUTE_NORMAL, NULL); @@ -604,8 +604,7 @@ BOOL WINAPI SetupIterateCabinetA(PCSTR CabinetFile, DWORD Reserved, if (!my_hsc.hfdi) return FALSE; - ret = ( sc_FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, - 0, sc_FNNOTIFY_A, NULL, &my_hsc) ) ? TRUE : FALSE; + ret = sc_FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, 0, sc_FNNOTIFY_A, NULL, &my_hsc); sc_FDIDestroy(my_hsc.hfdi); return ret; @@ -670,8 +669,7 @@ BOOL WINAPI SetupIterateCabinetW(PCWSTR CabinetFile, DWORD Reserved, if (!my_hsc.hfdi) return FALSE; - ret = ( sc_FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, - 0, sc_FNNOTIFY_W, NULL, &my_hsc) ) ? TRUE : FALSE; + ret = sc_FDICopy(my_hsc.hfdi, pszCabinet, pszCabPath, 0, sc_FNNOTIFY_W, NULL, &my_hsc); sc_FDIDestroy(my_hsc.hfdi); return ret;

1 0

Marek Chmiel : dssenh/tests: Hash tests for the DSSENH cryptographic service provider.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 09737c7b8dc3bf02563895e7290729732c9fe1ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=09737c7b8dc3bf02563895e72… Author: Marek Chmiel <kcmark(a)gmail.com> Date: Mon Aug 6 12:27:05 2012 -0500 dssenh/tests: Hash tests for the DSSENH cryptographic service provider. --- dlls/dssenh/tests/dssenh.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/dssenh/tests/dssenh.c b/dlls/dssenh/tests/dssenh.c index 0c37c91..3a5bdef 100644 --- a/dlls/dssenh/tests/dssenh.c +++ b/dlls/dssenh/tests/dssenh.c @@ -396,8 +396,92 @@ static void test_keylength(void) ok(result, "Expected release of CSP provider.\n"); } +struct hash_test { + ALG_ID algid; + BYTE* input; + DWORD dataLen; + BYTE hash[20]; + DWORD hashLen; +}; + +static const char testHashVal1[] = "I love working with Wine"; +static const char testHashVal2[] = "Wine is not an emulater."; +static const char testHashVal3[] = ""; + +static const struct hash_test hash_data[] = { + {CALG_MD5, (BYTE *)testHashVal1, sizeof(testHashVal1), + {0x4f, 0xf4, 0xd0, 0xdf, 0xe8, 0xf6, 0x6b, 0x1b, + 0x87, 0xea, 0xca, 0x3d, 0xe8, 0x3c, 0xdd, 0xae}, 16}, + {CALG_MD5, (BYTE *)testHashVal2, sizeof(testHashVal2), + {0x80, 0x5c, 0x1c, 0x0e, 0x79, 0x70, 0xd9, 0x38, + 0x04, 0x46, 0x19, 0xbe, 0x38, 0x1f, 0xef, 0xe1}, 16}, + {CALG_MD5, (BYTE *)testHashVal3, sizeof(testHashVal3), + {0x93, 0xb8, 0x85, 0xad, 0xfe, 0x0d, 0xa0, 0x89, + 0xcd, 0xf6, 0x34, 0x90, 0x4f, 0xd5, 0x9f, 0x71}, 16}, + {CALG_SHA, (BYTE *)testHashVal1, sizeof(testHashVal1), + {0x2a, 0xd0, 0xc9, 0x42, 0xfb, 0x73, 0x02, 0x48, 0xbb, 0x5f, + 0xc2, 0xa4, 0x78, 0xdd, 0xe4, 0x3b, 0xfc, 0x76, 0xe9, 0xe2}, 20}, + {CALG_SHA, (BYTE *)testHashVal2, sizeof(testHashVal2), + {0xfd, 0xfc, 0xab, 0x3a, 0xde, 0x33, 0x01, 0x38, 0xfe, 0xbb, + 0xc3, 0x13, 0x84, 0x20, 0x9e, 0x55, 0x94, 0x8d, 0xc6, 0x05}, 20}, + {CALG_SHA, (BYTE *)testHashVal3, sizeof(testHashVal3), + {0x5b, 0xa9, 0x3c, 0x9d, 0xb0, 0xcf, 0xf9, 0x3f, 0x52, 0xb5, + 0x21, 0xd7, 0x42, 0x0e, 0x43, 0xf6, 0xed, 0xa2, 0x78, 0x4f}, 20} +}; + +static void test_hash(const struct hash_test *tests, int testLen) +{ + HCRYPTPROV hProv = 0; + HCRYPTHASH hHash; + BYTE hashValue[36]; + BOOL result; + int i; + + result = CryptAcquireContextA( + &hProv, NULL, MS_ENH_DSS_DH_PROV, PROV_DSS_DH, CRYPT_VERIFYCONTEXT); + if(!result) + { + skip("DSSENH is currently not available, skipping hashing tests.\n"); + return; + } + ok(result, "Expected no errors.\n"); + + for(i = 0; i < testLen; i++) + { + BYTE* data = tests[i].input; + DWORD dataLen = tests[i].dataLen; + DWORD hashLen; + + /* test algid hash */ + result = CryptCreateHash(hProv, tests[i].algid, 0, 0, &hHash); + ok(result, "Expected creation of a hash.\n"); + + result = CryptHashData(hHash, data, dataLen, 0); + ok(result, "Expected data to be added to hash.\n"); + + dataLen = sizeof(DWORD); + result = CryptGetHashParam(hHash, HP_HASHSIZE, (BYTE *)&hashLen, &dataLen, 0); + ok(result && (hashLen == tests[i].hashLen), "Expected %d hash len, got %d.Error: %x\n", + tests[i].hashLen, hashLen, GetLastError()); + + result = CryptGetHashParam(hHash, HP_HASHVAL, hashValue, &hashLen, 0); + ok(result, "Expected hash value return.\n"); + + ok(!memcmp(hashValue, tests[i].hash, tests[i].hashLen), "Incorrect hash output.\n"); + + result = CryptHashData(hHash, data, dataLen, 0); + ok(!result, "Should not be able to add to hash.\n"); + + result = CryptDestroyHash(hHash); + ok(result, "Expected destruction of hash.\n"); + } + result = CryptReleaseContext(hProv, 0); + ok(result, "Expected release of the DSS Enhanced provider.\n"); +} + START_TEST(dssenh) { test_acquire_context(); test_keylength(); + test_hash(hash_data, TESTLEN(hash_data)); }

1 0

Piotr Caban : msvcp90: Added basic_filebuf<wchar> and basic_filebuf<short> implementation.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: ed22f3b14d0a2f137a5cafdbc7dd5246034413cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed22f3b14d0a2f137a5cafdbc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 14 10:51:55 2012 +0200 msvcp90: Added basic_filebuf<wchar> and basic_filebuf<short> implementation. --- dlls/msvcp90/ios.c | 710 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/locale.c | 4 +- dlls/msvcp90/msvcp90.h | 9 +- dlls/msvcp90/msvcp90.spec | 204 +++++++------- 4 files changed, 820 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed22f3b14d0a2f137a5ca…

1 0

Michael Stefaniuc : mmdevapi: Avoid a TRUE:FALSE conditional expression.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: b14fb331487dedb4855aa7bc8815068e08b38c46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b14fb331487dedb4855aa7bc8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 13 11:44:18 2012 +0200 mmdevapi: Avoid a TRUE:FALSE conditional expression. --- dlls/mmdevapi/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index c0e2ff6..8293dfc 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -163,7 +163,7 @@ static BOOL init_driver(void) *next = ','; } - return drvs.module ? TRUE : FALSE; + return drvs.module != 0; } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)

1 0

Piotr Caban : msvcp90: Only define virtual function callers in base class.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: f65cd1c18aa41fe745f40fca7f8468be6cbd8653 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65cd1c18aa41fe745f40fca7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 14 10:51:45 2012 +0200 msvcp90: Only define virtual function callers in base class. --- dlls/msvcp90/ios.c | 24 +++--------------------- 1 files changed, 3 insertions(+), 21 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index e99bba2..6e082f5 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -2361,8 +2361,6 @@ basic_filebuf_char* __thiscall basic_filebuf_char_open_mode(basic_filebuf_char * /* ?overflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHH(a)Z */ /* ?overflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHH(a)Z */ -#define call_basic_filebuf_char_overflow(this, c) CALL_VTBL_FUNC(this, 4, \ - int, (basic_filebuf_char*, int), (this, c)) DEFINE_THISCALL_WRAPPER(basic_filebuf_char_overflow, 8) int __thiscall basic_filebuf_char_overflow(basic_filebuf_char *this, int c) { @@ -2429,8 +2427,6 @@ int __thiscall basic_filebuf_char_overflow(basic_filebuf_char *this, int c) /* ?pbackfail@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHH(a)Z */ /* ?pbackfail@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHH(a)Z */ -#define call_basic_filebuf_char_pbackfail(this, c) CALL_VTBL_FUNC(this, 8, \ - int, (basic_filebuf_char*, int), (this, c)) DEFINE_THISCALL_WRAPPER(basic_filebuf_char_pbackfail, 8) int __thiscall basic_filebuf_char_pbackfail(basic_filebuf_char *this, int c) { @@ -2452,8 +2448,6 @@ int __thiscall basic_filebuf_char_pbackfail(basic_filebuf_char *this, int c) /* ?uflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ */ /* ?uflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ */ -#define call_basic_filebuf_char_uflow(this) CALL_VTBL_FUNC(this, 20, \ - int, (basic_filebuf_char*), (this)) DEFINE_THISCALL_WRAPPER(basic_filebuf_char_uflow, 4) int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this) { @@ -2504,8 +2498,6 @@ int __thiscall basic_filebuf_char_uflow(basic_filebuf_char *this) /* ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ */ /* ?underflow@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ */ -#define call_basic_filebuf_char_underflow(this) CALL_VTBL_FUNC(this, 16, \ - int, (basic_filebuf_char*), (this)) DEFINE_THISCALL_WRAPPER(basic_filebuf_char_underflow, 4) int __thiscall basic_filebuf_char_underflow(basic_filebuf_char *this) { @@ -2516,16 +2508,14 @@ int __thiscall basic_filebuf_char_underflow(basic_filebuf_char *this) if(basic_streambuf_char_gptr(&this->base) < basic_streambuf_char_egptr(&this->base)) return *basic_streambuf_char_gptr(&this->base); - ret = call_basic_filebuf_char_uflow(this); + ret = call_basic_streambuf_char_uflow(&this->base); if(ret != EOF) - ret = call_basic_filebuf_char_pbackfail(this, ret); + ret = call_basic_streambuf_char_pbackfail(&this->base, ret); return ret; } /* ?seekoff@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAE?AV?$fpos(a)H@2(a)JHH@Z */ /* ?seekoff@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAA?AV?$fpos(a)H@2(a)_JHH@Z */ -#define call_basic_filebuf_char_seekoff(this, ret, off, way, mode) CALL_VTBL_FUNC(this, 36, \ - fpos_int*, (basic_filebuf_char*, fpos_int*, streamoff, int, int), (this, ret, off, way, mode)) DEFINE_THISCALL_WRAPPER(basic_filebuf_char_seekoff, 20) fpos_int* __thiscall basic_filebuf_char_seekoff(basic_filebuf_char *this, fpos_int *ret, streamoff off, int way, int mode) @@ -2551,8 +2541,6 @@ fpos_int* __thiscall basic_filebuf_char_seekoff(basic_filebuf_char *this, /* ?seekpos@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAE?AV?$fpos(a)H@2(a)V32@H(a)Z */ /* ?seekpos@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAA?AV?$fpos(a)H@2(a)V32@H(a)Z */ -#define call_basic_filebuf_char_seekpos(this, ret, pos, mode) CALL_VTBL_FUNC(this, 40, \ - fpos_int*, (basic_filebuf_char*, fpos_int*, fpos_int, mode), (this, ret, pos, mode)) DEFINE_THISCALL_WRAPPER(basic_filebuf_char_seekpos, 36) fpos_int* __thiscall basic_filebuf_char_seekpos(basic_filebuf_char *this, fpos_int *ret, fpos_int pos, int mode) @@ -2579,8 +2567,6 @@ fpos_int* __thiscall basic_filebuf_char_seekpos(basic_filebuf_char *this, /* ?setbuf@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEPAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@2(a)PADH@Z */ /* ?setbuf@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAPEAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@2(a)PEAD_J@Z */ -#define call_basic_filebuf_char_setbuf(this, buf, count) CALL_VTBL_FUNC(this, 44, \ - basic_streambuf_char*, (basic_filebuf_char*, char*, streamsize), (this, buf, count)) DEFINE_THISCALL_WRAPPER(basic_filebuf_char_setbuf, 12) basic_streambuf_char* __thiscall basic_filebuf_char_setbuf(basic_filebuf_char *this, char *buf, streamsize count) { @@ -2598,8 +2584,6 @@ basic_streambuf_char* __thiscall basic_filebuf_char_setbuf(basic_filebuf_char *t /* ?sync@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEHXZ */ /* ?sync@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAHXZ */ -#define call_basic_filebuf_char_sync(this) CALL_VTBL_FUNC(this, 48, \ - int, (basic_filebuf_char*), (this)) DEFINE_THISCALL_WRAPPER(basic_filebuf_char_sync, 4) int __thiscall basic_filebuf_char_sync(basic_filebuf_char *this) { @@ -2608,15 +2592,13 @@ int __thiscall basic_filebuf_char_sync(basic_filebuf_char *this) if(!basic_filebuf_char_is_open(this)) return 0; - if(call_basic_filebuf_char_overflow(this, EOF) == EOF) + if(call_basic_streambuf_char_overflow(&this->base, EOF) == EOF) return 0; return fflush(this->file); } /* ?imbue@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MAEXABVlocale(a)2@@Z */ /* ?imbue@?$basic_filebuf(a)DU?$char_traits(a)D@std@@@std@@MEAAXAEBVlocale(a)2@@Z */ -#define call_basic_filebuf_char_imbue(this, loc) CALL_VTBL_FUNC(this, 52, \ - void, (basic_filebuf_char*, const locale*), (this, loc)) DEFINE_THISCALL_WRAPPER(basic_filebuf_char_imbue, 8) void __thiscall basic_filebuf_char_imbue(basic_filebuf_char *this, const locale *loc) {

1 0

Jacek Caban : rpcrt4: Added RpcError* stubs.
by Alexandre Julliard Aug. 14, 2012

Aug. 14, 2012

Module: wine Branch: master Commit: 028f3be092669bafc3aa050e8c0709bb4e9976af URL: http://source.winehq.org/git/wine.git/?a=commit;h=028f3be092669bafc3aa050e8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 13 13:32:49 2012 +0200 rpcrt4: Added RpcError* stubs. --- dlls/rpcrt4/rpcrt4.spec | 10 +++++----- dlls/rpcrt4/rpcrt4_main.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 4b5b553..33c1af5 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -53,7 +53,7 @@ @ stub I_RpcIfInqTransferSyntaxes @ stub I_RpcLogEvent @ stdcall I_RpcMapWin32Status(long) -@ stub I_RpcNegotiateTransferSyntax # wxp +@ stdcall I_RpcNegotiateTransferSyntax(ptr) @ stub I_RpcNsBindingSetEntryName @ stub I_RpcNsBindingSetEntryNameA @ stub I_RpcNsBindingSetEntryNameW @@ -376,12 +376,12 @@ @ stdcall RpcEpUnregister(ptr ptr ptr) @ stub RpcErrorAddRecord # wxp @ stub RpcErrorClearInformation # wxp -@ stub RpcErrorEndEnumeration # wxp -@ stub RpcErrorGetNextRecord # wxp -@ stub RpcErrorLoadErrorInfo # wxp +@ stdcall RpcErrorEndEnumeration(ptr) +@ stdcall RpcErrorGetNextRecord(ptr long ptr) +@ stdcall RpcErrorLoadErrorInfo(ptr long ptr) @ stub RpcErrorNumberOfRecords # wxp @ stub RpcErrorResetEnumeration # wxp -@ stub RpcErrorSaveErrorInfo # wxp +@ stdcall RpcErrorSaveErrorInfo(ptr ptr ptr) @ stdcall RpcErrorStartEnumeration(ptr) @ stub RpcFreeAuthorizationContext # wxp @ stdcall RpcGetAsyncCallStatus(ptr) RpcAsyncGetCallStatus diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c index cb6ff30..21c1c13 100644 --- a/dlls/rpcrt4/rpcrt4_main.c +++ b/dlls/rpcrt4/rpcrt4_main.c @@ -875,6 +875,42 @@ RPC_STATUS RPC_ENTRY RpcErrorStartEnumeration(RPC_ERROR_ENUM_HANDLE* EnumHandle) } /****************************************************************************** + * RpcErrorEndEnumeration (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcErrorEndEnumeration(RPC_ERROR_ENUM_HANDLE* EnumHandle) +{ + FIXME("(%p): stub\n", EnumHandle); + return RPC_S_OK; +} + +/****************************************************************************** + * RpcErrorSaveErrorInfo (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcErrorSaveErrorInfo(RPC_ERROR_ENUM_HANDLE *EnumHandle, void **ErrorBlob, SIZE_T *BlobSize) +{ + FIXME("(%p %p %p): stub\n", EnumHandle, ErrorBlob, BlobSize); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * RpcErrorLoadErrorInfo (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcErrorLoadErrorInfo(void *ErrorBlob, SIZE_T BlobSize, RPC_ERROR_ENUM_HANDLE *EnumHandle) +{ + FIXME("(%p %lu %p): stub\n", ErrorBlob, BlobSize, EnumHandle); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/****************************************************************************** + * RpcErrorGetNextRecord (rpcrt4.@) + */ +RPC_STATUS RPC_ENTRY RpcErrorGetNextRecord(RPC_ERROR_ENUM_HANDLE *EnumHandle, BOOL CopyStrings, RPC_EXTENDED_ERROR_INFO *ErrorInfo) +{ + FIXME("(%p %x %p): stub\n", EnumHandle, CopyStrings, ErrorInfo); + return RPC_S_ENTRY_NOT_FOUND; +} + +/****************************************************************************** * RpcMgmtSetCancelTimeout (rpcrt4.@) */ RPC_STATUS RPC_ENTRY RpcMgmtSetCancelTimeout(LONG Timeout)

1 0