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

Michael Stefaniuc : iexplore: Avoid a TRUE:FALSE conditional expression.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: d45070d48faf4a0e1d88c46734b8f584156c6195 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d45070d48faf4a0e1d88c4673… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Aug 13 11:44:06 2012 +0200 iexplore: Avoid a TRUE:FALSE conditional expression. --- dlls/ieframe/iexplore.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 00150a4..6c66aef 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -363,7 +363,7 @@ static INT_PTR CALLBACK ie_dialog_open_proc(HWND hwnd, UINT msg, WPARAM wparam, HWND hwndurl = GetDlgItem(hwnd, IDC_BROWSE_OPEN_URL); int len = GetWindowTextLengthW(hwndurl); - EnableWindow(GetDlgItem(hwnd, IDOK), len ? TRUE : FALSE); + EnableWindow(GetDlgItem(hwnd, IDOK), len != 0); break; } case IDOK:

1 0

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

14 Aug '12

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

Jacek Caban : rpcrt4: Added RpcError* stubs.
by Alexandre Julliard 14 Aug '12

14 Aug '12

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

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

14 Aug '12

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

Lucas Zawacki : dinput/tests: Tests for IDirectInputJoyConfig8_GetConfig.
by Alexandre Julliard 14 Aug '12

14 Aug '12

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 : dinput: Semi-stub for IDirectInputJoyConfig8_GetConfig.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: e8f808a6070d2ddbe030907cff684befdd40783e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f808a6070d2ddbe030907cf… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Mon Aug 13 20:36:56 2012 -0300 dinput: Semi-stub for IDirectInputJoyConfig8_GetConfig. --- dlls/dinput/dinput_main.c | 40 ++++++++++++++++++++++++++++++++++++++-- dlls/dinput/tests/dinput.c | 4 ++-- 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 46b7e08..63ff439 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1142,8 +1142,44 @@ static HRESULT WINAPI JoyConfig8Impl_DeleteType(IDirectInputJoyConfig8 *iface, L static HRESULT WINAPI JoyConfig8Impl_GetConfig(IDirectInputJoyConfig8 *iface, UINT id, LPDIJOYCONFIG info, DWORD flags) { - FIXME( "(%p)->(%d, %p, 0x%08x): stub!\n", iface, id, info, flags ); - return E_NOTIMPL; + IDirectInputImpl *di = impl_from_IDirectInputJoyConfig8(iface); + UINT found = 0; + int i, j, r; + + FIXME("(%p)->(%d, %p, 0x%08x): semi-stub!\n", iface, id, info, flags); + +#define X(x) if (flags & x) FIXME("\tflags |= "#x"\n"); + X(DIJC_GUIDINSTANCE) + X(DIJC_REGHWCONFIGTYPE) + X(DIJC_GAIN) + X(DIJC_CALLOUT) +#undef X + + /* Enumerate all joysticks in order */ + for (i = 0; i < NB_DINPUT_DEVICES; i++) + { + if (!dinput_devices[i]->enum_deviceA) continue; + + for (j = 0, r = -1; r != 0; j++) + { + DIDEVICEINSTANCEA dev; + dev.dwSize = sizeof(dev); + if ((r = dinput_devices[i]->enum_deviceA(DI8DEVCLASS_GAMECTRL, 0, &dev, di->dwVersion, j))) + { + /* Only take into account the chosen id */ + if (found == id) + { + if (flags & DIJC_GUIDINSTANCE) + info->guidInstance = dev.guidInstance; + + return DI_OK; + } + found += 1; + } + } + } + + return DIERR_NOMOREITEMS; } static HRESULT WINAPI JoyConfig8Impl_SetConfig(IDirectInputJoyConfig8 *iface, UINT id, LPCDIJOYCONFIG info, DWORD flags) diff --git a/dlls/dinput/tests/dinput.c b/dlls/dinput/tests/dinput.c index c5386d6..cc28985 100644 --- a/dlls/dinput/tests/dinput.c +++ b/dlls/dinput/tests/dinput.c @@ -595,11 +595,11 @@ static void test_DirectInputJoyConfig8(void) { hr = IDirectInputJoyConfig8_GetConfig(pDIJC, i, &info, DIJC_GUIDINSTANCE); - todo_wine ok (hr == DI_OK || hr == DIERR_NOMOREITEMS, + 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)), + ok (SUCCEEDED(IDirectInput_CreateDevice(pDI, &info.guidInstance, &pDID, NULL)), "IDirectInput_CreateDevice failed with guid from GetConfig hr = 0x%08x\n", hr); }

1 0

Piotr Caban : msvcp: Rename msvcp90 debug channel.
by Alexandre Julliard 14 Aug '12

14 Aug '12

Module: wine Branch: master Commit: 7a0c6f44efd375ccd2cb2a6d817d46eb8c25c701 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a0c6f44efd375ccd2cb2a6d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Aug 14 10:51:34 2012 +0200 msvcp: Rename msvcp90 debug channel. --- dlls/msvcp60/exception.c | 2 +- dlls/msvcp60/main.c | 2 +- dlls/msvcp60/string.c | 2 +- dlls/msvcp90/exception.c | 2 +- dlls/msvcp90/ios.c | 2 +- dlls/msvcp90/locale.c | 2 +- dlls/msvcp90/misc.c | 2 +- dlls/msvcp90/msvcp90_main.c | 2 +- dlls/msvcp90/string.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/msvcp60/exception.c b/dlls/msvcp60/exception.c index 0b464f8..e85463d 100644 --- a/dlls/msvcp60/exception.c +++ b/dlls/msvcp60/exception.c @@ -25,7 +25,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); /* dlls/msvcrt/cppexcept.h */ typedef void (*cxx_copy_ctor)(void); diff --git a/dlls/msvcp60/main.c b/dlls/msvcp60/main.c index f848a30..a979528 100644 --- a/dlls/msvcp60/main.c +++ b/dlls/msvcp60/main.c @@ -26,7 +26,7 @@ #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #ifdef __i386__ diff --git a/dlls/msvcp60/string.c b/dlls/msvcp60/string.c index cac9596..2553e5b 100644 --- a/dlls/msvcp60/string.c +++ b/dlls/msvcp60/string.c @@ -27,7 +27,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #define FROZEN 255 diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 7f2dbe8..da952d4 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -25,7 +25,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); /* dlls/msvcrt/cppexcept.h */ typedef void (*cxx_copy_ctor)(void); diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 8592f18..e99bba2 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -27,7 +27,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); /* ?_Index(a)ios_base@std@@0HA */ int ios_base_Index = 0; diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 9cbf72c..935d381 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -34,7 +34,7 @@ #include "winnls.h" #include "wine/unicode.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); char* __cdecl _Getdays(void); char* __cdecl _Getmonths(void); diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 122c7fa..c8c4122 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -26,7 +26,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); /* ??0_Mutex(a)std@@QAE(a)XZ */ /* ??0_Mutex(a)std@@QEAA(a)XZ */ diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index a7dc864..18a2514 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -26,7 +26,7 @@ #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #ifdef __i386__ diff --git a/dlls/msvcp90/string.c b/dlls/msvcp90/string.c index d9afe3d..63ef466 100644 --- a/dlls/msvcp90/string.c +++ b/dlls/msvcp90/string.c @@ -27,7 +27,7 @@ #include "windef.h" #include "winbase.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(msvcp90); +WINE_DEFAULT_DEBUG_CHANNEL(msvcp); /* _String_iterator<char> and _String_const_iterator<char> class */ typedef struct {

1 0

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

14 Aug '12

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

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

14 Aug '12

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 : wordpad: Avoid TRUE:FALSE conditional expressions.
by Alexandre Julliard 13 Aug '12

13 Aug '12

Module: wine Branch: master Commit: bf3e3d02d57c9661b4fea95a5c4144b7f841b17f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf3e3d02d57c9661b4fea95a5… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Aug 8 21:42:16 2012 +0200 wordpad: Avoid TRUE:FALSE conditional expressions. --- programs/wordpad/wordpad.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 24d956a..8a2afc4 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -583,10 +583,10 @@ static void dialog_choose_font(void) SendMessageW(hEditorWnd, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt); lstrcpyW(cf.lpLogFont->lfFaceName, fmt.szFaceName); - cf.lpLogFont->lfItalic = (fmt.dwEffects & CFE_ITALIC) ? TRUE : FALSE; + cf.lpLogFont->lfItalic = (fmt.dwEffects & CFE_ITALIC) != 0; cf.lpLogFont->lfWeight = (fmt.dwEffects & CFE_BOLD) ? FW_BOLD : FW_NORMAL; - cf.lpLogFont->lfUnderline = (fmt.dwEffects & CFE_UNDERLINE) ? TRUE : FALSE; - cf.lpLogFont->lfStrikeOut = (fmt.dwEffects & CFE_STRIKEOUT) ? TRUE : FALSE; + cf.lpLogFont->lfUnderline = (fmt.dwEffects & CFE_UNDERLINE) != 0; + cf.lpLogFont->lfStrikeOut = (fmt.dwEffects & CFE_STRIKEOUT) != 0; cf.lpLogFont->lfHeight = -MulDiv(fmt.yHeight / 20, GetDeviceCaps(hDC, LOGPIXELSY), 72); cf.rgbColors = fmt.crTextColor;

1 0