November 2009 - Wine-commits

Nikolay Sivov : comctl32/listview: Get rid of helper used once.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: dcd54f08fc377c0e400ee70df51167e2435bc92e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcd54f08fc377c0e400ee70df… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Nov 26 23:49:02 2009 +0300 comctl32/listview: Get rid of helper used once. --- dlls/comctl32/listview.c | 44 +++++++++++++------------------------------- 1 files changed, 13 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index bbb7502..c95ba67 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -453,7 +453,6 @@ static void LISTVIEW_GetItemBox(const LISTVIEW_INFO *, INT, LPRECT); static void LISTVIEW_GetItemOrigin(const LISTVIEW_INFO *, INT, LPPOINT); static BOOL LISTVIEW_GetItemPosition(const LISTVIEW_INFO *, INT, LPPOINT); static BOOL LISTVIEW_GetItemRect(const LISTVIEW_INFO *, INT, LPRECT); -static INT LISTVIEW_GetLabelWidth(const LISTVIEW_INFO *, INT); static void LISTVIEW_GetOrigin(const LISTVIEW_INFO *, LPPOINT); static BOOL LISTVIEW_GetViewRect(const LISTVIEW_INFO *, LPRECT); static void LISTVIEW_UpdateSize(LISTVIEW_INFO *); @@ -2786,11 +2785,23 @@ static INT LISTVIEW_CalculateItemWidth(const LISTVIEW_INFO *infoPtr) } else /* LV_VIEW_SMALLICON, or LV_VIEW_LIST */ { + WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' }; + LVITEMW lvItem; BOOL empty; INT i; + lvItem.mask = LVIF_TEXT; + lvItem.iSubItem = 0; + for (i = 0; i < infoPtr->nItemCount; i++) - nItemWidth = max(LISTVIEW_GetLabelWidth(infoPtr, i), nItemWidth); + { + lvItem.iItem = i; + lvItem.pszText = szDispText; + lvItem.cchTextMax = DISP_TEXT_SIZE; + if (LISTVIEW_GetItemW(infoPtr, &lvItem)) + nItemWidth = max(LISTVIEW_GetStringWidthT(infoPtr, lvItem.pszText, TRUE), + nItemWidth); + } empty = nItemWidth == 0; if (infoPtr->himlSmall) nItemWidth += infoPtr->iconSize.cx; @@ -6822,35 +6833,6 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPR return TRUE; } - -/*** - * DESCRIPTION: - * Retrieves the width of a label. - * - * PARAMETER(S): - * [I] infoPtr : valid pointer to the listview structure - * - * RETURN: - * SUCCESS : string width (in pixels) - * FAILURE : zero - */ -static INT LISTVIEW_GetLabelWidth(const LISTVIEW_INFO *infoPtr, INT nItem) -{ - WCHAR szDispText[DISP_TEXT_SIZE] = { '\0' }; - LVITEMW lvItem; - - TRACE("(nItem=%d)\n", nItem); - - lvItem.mask = LVIF_TEXT; - lvItem.iItem = nItem; - lvItem.iSubItem = 0; - lvItem.pszText = szDispText; - lvItem.cchTextMax = DISP_TEXT_SIZE; - if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return 0; - - return LISTVIEW_GetStringWidthT(infoPtr, lvItem.pszText, TRUE); -} - /*** * DESCRIPTION: * Retrieves the spacing between listview control items.

1 0

Henri Verbeet : wineoss.drv: Use wine_dbg_sprintf() in a few debug utility functions.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 3be325040cdfcd68a47f33fe0fd55708c7df1409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be325040cdfcd68a47f33fe0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 30 10:22:10 2009 +0100 wineoss.drv: Use wine_dbg_sprintf() in a few debug utility functions. --- dlls/wineoss.drv/audio.c | 8 ++------ dlls/wineoss.drv/mixer.c | 20 +++++--------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/dlls/wineoss.drv/audio.c b/dlls/wineoss.drv/audio.c index 98575f1..cd89cb7 100644 --- a/dlls/wineoss.drv/audio.c +++ b/dlls/wineoss.drv/audio.c @@ -107,7 +107,6 @@ unsigned numInDev; /* These strings used only for tracing */ static const char * getCmdString(enum win_wm_message msg) { - static char unknown[32]; #define MSG_TO_STR(x) case x: return #x switch(msg) { MSG_TO_STR(WINE_WM_PAUSING); @@ -121,8 +120,7 @@ static const char * getCmdString(enum win_wm_message msg) MSG_TO_STR(WINE_WM_STOPPING); } #undef MSG_TO_STR - sprintf(unknown, "UNKNOWN(0x%08x)", msg); - return unknown; + return wine_dbg_sprintf("UNKNOWN(0x%08x)", msg); } int getEnables(OSS_DEVICE *ossdev) @@ -133,7 +131,6 @@ int getEnables(OSS_DEVICE *ossdev) static const char * getMessage(UINT msg) { - static char unknown[32]; #define MSG_TO_STR(x) case x: return #x switch(msg) { MSG_TO_STR(DRVM_INIT); @@ -175,8 +172,7 @@ static const char * getMessage(UINT msg) MSG_TO_STR(DRV_QUERYDSOUNDDESC); } #undef MSG_TO_STR - sprintf(unknown, "UNKNOWN(0x%04x)", msg); - return unknown; + return wine_dbg_sprintf("UNKNOWN(0x%04x)", msg); } static DWORD wodDevInterfaceSize(UINT wDevID, LPDWORD dwParam1) diff --git a/dlls/wineoss.drv/mixer.c b/dlls/wineoss.drv/mixer.c index 0ed9ab0..ac72c7a 100644 --- a/dlls/wineoss.drv/mixer.c +++ b/dlls/wineoss.drv/mixer.c @@ -113,7 +113,6 @@ static struct mixer MIX_Mixers[MAX_MIXERDRV]; static const char * getMessage(UINT uMsg) { - static char str[64]; #define MSG_TO_STR(x) case x: return #x; switch (uMsg) { MSG_TO_STR(DRVM_INIT); @@ -130,13 +129,11 @@ static const char * getMessage(UINT uMsg) MSG_TO_STR(MXDM_SETCONTROLDETAILS); } #undef MSG_TO_STR - sprintf(str, "UNKNOWN(%08x)", uMsg); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", uMsg); } static const char * getIoctlCommand(int command) { - static char str[64]; #define IOCTL_TO_STR(x) case x: return #x; switch (command) { IOCTL_TO_STR(SOUND_MIXER_VOLUME); @@ -172,13 +169,11 @@ static const char * getIoctlCommand(int command) #endif } #undef IOCTL_TO_STR - sprintf(str, "UNKNOWN(%08x)", command); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", command); } static const char * getControlType(DWORD dwControlType) { - static char str[64]; #define TYPE_TO_STR(x) case x: return #x switch (dwControlType) { TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_CUSTOM); @@ -214,13 +209,11 @@ static const char * getControlType(DWORD dwControlType) TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_MILLITIME); } #undef TYPE_TO_STR - sprintf(str, "UNKNOWN(%08x)", dwControlType); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", dwControlType); } static const char * getComponentType(DWORD dwComponentType) { - static char str[64]; #define TYPE_TO_STR(x) case x: return #x; switch (dwComponentType) { TYPE_TO_STR(MIXERLINE_COMPONENTTYPE_DST_UNDEFINED); @@ -245,13 +238,11 @@ static const char * getComponentType(DWORD dwComponentType) TYPE_TO_STR(MIXERLINE_COMPONENTTYPE_SRC_ANALOG); } #undef TYPE_TO_STR - sprintf(str, "UNKNOWN(%08x)", dwComponentType); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", dwComponentType); } static const char * getTargetType(DWORD dwType) { - static char str[64]; #define TYPE_TO_STR(x) case x: return #x; switch (dwType) { TYPE_TO_STR(MIXERLINE_TARGETTYPE_UNDEFINED); @@ -262,8 +253,7 @@ static const char * getTargetType(DWORD dwType) TYPE_TO_STR(MIXERLINE_TARGETTYPE_AUX); } #undef TYPE_TO_STR - sprintf(str, "UNKNOWN(%08x)", dwType); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", dwType); } static const WCHAR sz_short_volume [] = {'V','o','l',0};

1 0

Henri Verbeet : winecoreaudio.drv: Use wine_dbg_sprintf() in a few debug utility functions.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: c369f338933e208a3b93f87fdc1d2072626f9e88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c369f338933e208a3b93f87fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 30 10:22:11 2009 +0100 winecoreaudio.drv: Use wine_dbg_sprintf() in a few debug utility functions. --- dlls/winecoreaudio.drv/audio.c | 4 +--- dlls/winecoreaudio.drv/mixer.c | 16 ++++------------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index f48a5aa..8223dff 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -264,7 +264,6 @@ OSStatus CoreAudio_wiAudioUnitIOProc(void *inRefCon, static const char * getMessage(UINT msg) { - static char unknown[32]; #define MSG_TO_STR(x) case x: return #x switch(msg) { MSG_TO_STR(DRVM_INIT); @@ -306,8 +305,7 @@ static const char * getMessage(UINT msg) MSG_TO_STR(DRV_QUERYDSOUNDDESC); } #undef MSG_TO_STR - sprintf(unknown, "UNKNOWN(0x%04x)", msg); - return unknown; + return wine_dbg_sprintf("UNKNOWN(0x%04x)", msg); } #define kStopLoopMessage 0 diff --git a/dlls/winecoreaudio.drv/mixer.c b/dlls/winecoreaudio.drv/mixer.c index 7c01c57..389caad 100644 --- a/dlls/winecoreaudio.drv/mixer.c +++ b/dlls/winecoreaudio.drv/mixer.c @@ -92,7 +92,6 @@ static int numMixers = 1; static const char * getMessage(UINT uMsg) { - static char str[64]; #define MSG_TO_STR(x) case x: return #x; switch (uMsg) { MSG_TO_STR(DRVM_INIT); @@ -109,13 +108,11 @@ static const char * getMessage(UINT uMsg) MSG_TO_STR(MXDM_SETCONTROLDETAILS); } #undef MSG_TO_STR - sprintf(str, "UNKNOWN(%08x)", uMsg); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", uMsg); } static const char * getControlType(DWORD dwControlType) { - static char str[64]; #define TYPE_TO_STR(x) case x: return #x; switch (dwControlType) { TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_CUSTOM); @@ -151,13 +148,11 @@ static const char * getControlType(DWORD dwControlType) TYPE_TO_STR(MIXERCONTROL_CONTROLTYPE_MILLITIME); } #undef TYPE_TO_STR - sprintf(str, "UNKNOWN(%08x)", dwControlType); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", dwControlType); } static const char * getComponentType(DWORD dwComponentType) { - static char str[64]; #define TYPE_TO_STR(x) case x: return #x; switch (dwComponentType) { TYPE_TO_STR(MIXERLINE_COMPONENTTYPE_DST_UNDEFINED); @@ -182,13 +177,11 @@ static const char * getComponentType(DWORD dwComponentType) TYPE_TO_STR(MIXERLINE_COMPONENTTYPE_SRC_ANALOG); } #undef TYPE_TO_STR - sprintf(str, "UNKNOWN(%08x)", dwComponentType); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", dwComponentType); } static const char * getTargetType(DWORD dwType) { - static char str[64]; #define TYPE_TO_STR(x) case x: return #x; switch (dwType) { TYPE_TO_STR(MIXERLINE_TARGETTYPE_UNDEFINED); @@ -199,8 +192,7 @@ static const char * getTargetType(DWORD dwType) TYPE_TO_STR(MIXERLINE_TARGETTYPE_AUX); } #undef TYPE_TO_STR - sprintf(str, "UNKNOWN(%08x)", dwType); - return str; + return wine_dbg_sprintf("UNKNOWN(%08x)", dwType); } /* FIXME is there a better way ? */

1 0

Paul Chitescu : authz: Stub for AuthzInitializeResourceManager.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 353339154ae33854fc3b11baeafeaf8da53b8c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=353339154ae33854fc3b11bae… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Nov 24 18:50:55 2009 +0200 authz: Stub for AuthzInitializeResourceManager. --- dlls/authz/authz.c | 14 ++++++++++++++ dlls/authz/authz.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/authz/authz.c b/dlls/authz/authz.c index 6e98aac..2c1f3d1 100644 --- a/dlls/authz/authz.c +++ b/dlls/authz/authz.c @@ -42,3 +42,17 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +/*********************************************************************** + * AuthzInitializeResourceManager (AUTHZ.@) + */ +BOOL WINAPI AuthzInitializeResourceManager(DWORD flags, LPVOID pfnAccessChecker, + LPVOID pfnComputeDynGroups, LPVOID pfnFreeDynGroups, + LPCWSTR managerName, LPVOID lpManagerHandle ) +{ + FIXME("(0x%X,%p,%p,%p,%s,%p): stub\n", flags, pfnAccessChecker, + pfnComputeDynGroups, pfnFreeDynGroups, + debugstr_w(managerName), lpManagerHandle); + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; +} diff --git a/dlls/authz/authz.spec b/dlls/authz/authz.spec index bc3010e..8ffd52b 100644 --- a/dlls/authz/authz.spec +++ b/dlls/authz/authz.spec @@ -13,7 +13,7 @@ @ stub AuthzInitializeContextFromToken @ stub AuthzInitializeObjectAccessAuditEvent @ stub AuthzInitializeObjectAccessAuditEvent2 -@ stub AuthzInitializeResourceManager +@ stdcall AuthzInitializeResourceManager(long ptr ptr ptr wstr ptr) @ stub AuthzInstallSecurityEventSource @ stub AuthzOpenObjectAudit @ stub AuthzRegisterSecurityEventSource

1 0

Dan Kegel : advpack: fix off-by-one error in AdvInstallFileW that caused buffer overrun.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: ced19b425a7db2ca88dbfa5de429f20075b4c6d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ced19b425a7db2ca88dbfa5de… Author: Dan Kegel <dank(a)kegel.com> Date: Thu Nov 26 21:46:51 2009 -0800 advpack: fix off-by-one error in AdvInstallFileW that caused buffer overrun. --- dlls/advpack/files.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/files.c b/dlls/advpack/files.c index 216b863..679d236 100644 --- a/dlls/advpack/files.c +++ b/dlls/advpack/files.c @@ -279,13 +279,13 @@ HRESULT WINAPI AdvInstallFileW(HWND hwnd, LPCWSTR lpszSourceDir, LPCWSTR lpszSou if (lpszDestFile) { dwLen = lstrlenW(lpszDestFile); - szDestFilename = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); + szDestFilename = HeapAlloc(GetProcessHeap(), 0, (dwLen+1) * sizeof(WCHAR)); lstrcpyW(szDestFilename, lpszDestFile); } else { dwLen = lstrlenW(lpszSourceFile); - szDestFilename = HeapAlloc(GetProcessHeap(), 0, dwLen * sizeof(WCHAR)); + szDestFilename = HeapAlloc(GetProcessHeap(), 0, (dwLen+1) * sizeof(WCHAR)); lstrcpyW(szDestFilename, lpszSourceFile); }

1 0

Jacek Caban : wininet: Don't use INTERNET_SetLastError in HttpSendRequestW.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 4e3eabd6fa261976296e74d3cb0c3c09e87842e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e3eabd6fa261976296e74d3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 00:14:41 2009 +0100 wininet: Don't use INTERNET_SetLastError in HttpSendRequestW. --- dlls/wininet/http.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index a250cbf..e4b6f1c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3405,7 +3405,7 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, http_request_t *lpwhr; http_session_t *lpwhs = NULL; appinfo_t *hIC = NULL; - BOOL r; + DWORD res = ERROR_SUCCESS; TRACE("%p, %s, %i, %p, %i)\n", hHttpRequest, debugstr_wn(lpszHeaders, dwHeaderLength), dwHeaderLength, lpOptional, dwOptionalLength); @@ -3413,24 +3413,21 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, lpwhr = (http_request_t*) WININET_GetObject( hHttpRequest ); if (NULL == lpwhr || lpwhr->hdr.htype != WH_HHTTPREQ) { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - r = FALSE; + res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; goto lend; } lpwhs = lpwhr->lpHttpSession; if (NULL == lpwhs || lpwhs->hdr.htype != WH_HHTTPSESSION) { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - r = FALSE; + res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; goto lend; } hIC = lpwhs->lpAppInfo; if (NULL == hIC || hIC->hdr.htype != WH_HINIT) { - INTERNET_SetLastError(ERROR_INTERNET_INCORRECT_HANDLE_TYPE); - r = FALSE; + res = ERROR_INTERNET_INCORRECT_HANDLE_TYPE; goto lend; } @@ -3464,19 +3461,23 @@ BOOL WINAPI HttpSendRequestW(HINTERNET hHttpRequest, LPCWSTR lpszHeaders, /* * This is from windows. */ - INTERNET_SetLastError(ERROR_IO_PENDING); - r = FALSE; + res = ERROR_IO_PENDING; } else { - r = HTTP_HttpSendRequestW(lpwhr, lpszHeaders, + BOOL r = HTTP_HttpSendRequestW(lpwhr, lpszHeaders, dwHeaderLength, lpOptional, dwOptionalLength, dwOptionalLength, TRUE); + if(!r) + res = INTERNET_GetLastError(); } lend: if( lpwhr ) WININET_Release( &lpwhr->hdr ); - return r; + + if(res != ERROR_SUCCESS) + SetLastError(res); + return res == ERROR_SUCCESS; } /***********************************************************************

1 0

Jacek Caban : shdocvw: Use CoTaskMemFree to free url.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 75c71b4b9c9db31f649d1534658773e2053518af URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c71b4b9c9db31f649d15346… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 30 00:15:36 2009 +0100 shdocvw: Use CoTaskMemFree to free url. Pointed out by Dan Kegel. --- dlls/shdocvw/dochost.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index f3035e1..5d661fd 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -753,5 +753,5 @@ void DocHost_Release(DocHost *This) ConnectionPointContainer_Destroy(&This->cps); - SysFreeString(This->url); + CoTaskMemFree(This->url); }

1 0

Vitaliy Margolen : dinput: Fix definitions to match PSDK.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: e1d6e3b258278b0aa456e9ea7a34dcf56598298d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1d6e3b258278b0aa456e9ea7… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Nov 29 21:07:17 2009 -0700 dinput: Fix definitions to match PSDK. --- dlls/dinput/dinput_main.c | 2 +- include/dinput.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 78a5e26..5b16100 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -224,7 +224,7 @@ void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) { for (i=0;i<lpdiActionFormat->dwNumActions;i++) { FIXME("diaf.rgoAction[%u]:\n", i); FIXME("\tuAppData=%lx\n", lpdiActionFormat->rgoAction[i].uAppData); - FIXME("\tdwSemantics=%x\n", lpdiActionFormat->rgoAction[i].dwSemantics); + FIXME("\tdwSemantic=%x\n", lpdiActionFormat->rgoAction[i].dwSemantic); FIXME("\tdwFlags=%x\n", lpdiActionFormat->rgoAction[i].dwFlags); FIXME("\tszActionName=%s\n", debugstr_a(lpdiActionFormat->rgoAction[i].u.lptszActionName)); FIXME("\tguidInstance=%s\n", debugstr_guid(&lpdiActionFormat->rgoAction[i].guidInstance)); diff --git a/include/dinput.h b/include/dinput.h index 8c557eb..36b385f 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -1106,7 +1106,7 @@ typedef BOOL (CALLBACK *LPDIENUMEFFECTSINFILECALLBACK)(LPCDIFILEEFFECT , LPVOID) /* DInput 8 structures and types */ typedef struct _DIACTIONA { UINT_PTR uAppData; - DWORD dwSemantics; + DWORD dwSemantic; DWORD dwFlags; union { LPCSTR lptszActionName; @@ -1120,7 +1120,7 @@ typedef const DIACTIONA *LPCDIACTIONA; typedef struct _DIACTIONW { UINT_PTR uAppData; - DWORD dwSemantics; + DWORD dwSemantic; DWORD dwFlags; union { LPCWSTR lptszActionName;

1 0

Vitaliy Margolen : dinput: Improve dumping of DIACTIONFORMAT.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 29561f492e935447c31698984aea51592bd9e58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=29561f492e935447c31698984… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Nov 29 21:07:21 2009 -0700 dinput: Improve dumping of DIACTIONFORMAT. --- dlls/dinput/dinput_main.c | 25 +++++++++++++------------ 1 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 5b16100..27a0e05 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -221,25 +221,26 @@ void _dump_diactionformatA(LPDIACTIONFORMATA lpdiActionFormat) { FIXME("diaf.dwDataSize = %d\n", lpdiActionFormat->dwDataSize); FIXME("diaf.dwNumActions = %d\n", lpdiActionFormat->dwNumActions); FIXME("diaf.rgoAction = %p\n", lpdiActionFormat->rgoAction); - for (i=0;i<lpdiActionFormat->dwNumActions;i++) { - FIXME("diaf.rgoAction[%u]:\n", i); - FIXME("\tuAppData=%lx\n", lpdiActionFormat->rgoAction[i].uAppData); - FIXME("\tdwSemantic=%x\n", lpdiActionFormat->rgoAction[i].dwSemantic); - FIXME("\tdwFlags=%x\n", lpdiActionFormat->rgoAction[i].dwFlags); - FIXME("\tszActionName=%s\n", debugstr_a(lpdiActionFormat->rgoAction[i].u.lptszActionName)); - FIXME("\tguidInstance=%s\n", debugstr_guid(&lpdiActionFormat->rgoAction[i].guidInstance)); - FIXME("\tdwObjID=%x\n", lpdiActionFormat->rgoAction[i].dwObjID); - FIXME("\tdwHow=%x\n", lpdiActionFormat->rgoAction[i].dwHow); - } FIXME("diaf.guidActionMap = %s\n", debugstr_guid(&lpdiActionFormat->guidActionMap)); - FIXME("diaf.dwGenre = %d\n", lpdiActionFormat->dwGenre); + FIXME("diaf.dwGenre = 0x%08x\n", lpdiActionFormat->dwGenre); FIXME("diaf.dwBufferSize = %d\n", lpdiActionFormat->dwBufferSize); FIXME("diaf.lAxisMin = %d\n", lpdiActionFormat->lAxisMin); FIXME("diaf.lAxisMax = %d\n", lpdiActionFormat->lAxisMax); FIXME("diaf.hInstString = %p\n", lpdiActionFormat->hInstString); FIXME("diaf.ftTimeStamp ...\n"); - FIXME("diaf.dwCRC = %x\n", lpdiActionFormat->dwCRC); + FIXME("diaf.dwCRC = 0x%x\n", lpdiActionFormat->dwCRC); FIXME("diaf.tszActionMap = %s\n", debugstr_a(lpdiActionFormat->tszActionMap)); + for (i = 0; i < lpdiActionFormat->dwNumActions; i++) + { + FIXME("diaf.rgoAction[%u]:\n", i); + FIXME("\tuAppData=0x%lx\n", lpdiActionFormat->rgoAction[i].uAppData); + FIXME("\tdwSemantic=0x%08x\n", lpdiActionFormat->rgoAction[i].dwSemantic); + FIXME("\tdwFlags=0x%x\n", lpdiActionFormat->rgoAction[i].dwFlags); + FIXME("\tszActionName=%s\n", debugstr_a(lpdiActionFormat->rgoAction[i].u.lptszActionName)); + FIXME("\tguidInstance=%s\n", debugstr_guid(&lpdiActionFormat->rgoAction[i].guidInstance)); + FIXME("\tdwObjID=0x%x\n", lpdiActionFormat->rgoAction[i].dwObjID); + FIXME("\tdwHow=0x%x\n", lpdiActionFormat->rgoAction[i].dwHow); + } } /******************************************************************************

1 0

Vitaliy Margolen : dinput: Pass event instance ID to queue_event instead of offset.
by Alexandre Julliard 30 Nov '09

30 Nov '09

Module: wine Branch: master Commit: 2665272d6cd4bdd4c8c5ef2c6171c4ae6cdbfdf7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2665272d6cd4bdd4c8c5ef2c6… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Nov 29 21:07:25 2009 -0700 dinput: Pass event instance ID to queue_event instead of offset. --- dlls/dinput/device.c | 4 ++-- dlls/dinput/device_private.h | 2 +- dlls/dinput/joystick_linux.c | 3 +-- dlls/dinput/joystick_linuxinput.c | 3 +-- dlls/dinput/keyboard.c | 4 ++-- dlls/dinput/mouse.c | 4 ++-- 6 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 941206c..cf91153 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -533,10 +533,10 @@ int find_property(const DataFormat *df, LPCDIPROPHEADER ph) * queue_event - add new event to the ring queue */ -void queue_event(LPDIRECTINPUTDEVICE8A iface, int ofs, DWORD data, DWORD time, DWORD seq) +void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD time, DWORD seq) { IDirectInputDevice2AImpl *This = (IDirectInputDevice2AImpl *)iface; - int next_pos; + int next_pos, ofs = id_to_offset(&This->data_format, inst_id); /* Event is being set regardless of the queue state */ if (This->hEvent) SetEvent(This->hEvent); diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 3463382..d62e32e 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -78,7 +78,7 @@ extern DWORD get_config_key(HKEY, HKEY, const char*, char*, DWORD); /* Routines to do DataFormat / WineFormat conversions */ extern void fill_DataFormat(void *out, DWORD size, const void *in, const DataFormat *df) ; extern void release_DataFormat(DataFormat *df) ; -extern void queue_event(LPDIRECTINPUTDEVICE8A iface, int ofs, DWORD data, DWORD time, DWORD seq); +extern void queue_event(LPDIRECTINPUTDEVICE8A iface, int inst_id, DWORD data, DWORD time, DWORD seq); /* Helper functions to work with data format */ extern int id_to_object(LPCDIDATAFORMAT df, int id); extern int id_to_offset(const DataFormat *df, int id); diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 2203a20..1396ea5 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -614,8 +614,7 @@ static void joy_polldev(JoystickGenericImpl *This_in) { } } if (inst_id >= 0) - queue_event((LPDIRECTINPUTDEVICE8A)This, - id_to_offset(&This->generic.base.data_format, inst_id), + queue_event((LPDIRECTINPUTDEVICE8A)This, inst_id, value, jse.time, This->generic.base.dinput->evsequence++); } } diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 67a1ee3..6c3c8cc 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -824,8 +824,7 @@ static void joy_polldev(JoystickGenericImpl *iface) break; } if (inst_id >= 0) - queue_event((LPDIRECTINPUTDEVICE8A)This, - id_to_offset(&This->generic.base.data_format, inst_id), + queue_event((LPDIRECTINPUTDEVICE8A)This, inst_id, value, ie.time.tv_usec, This->generic.base.dinput->evsequence++); } } diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index de8c63c..3692878 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -107,9 +107,9 @@ static int KeyboardCallback( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM This->DInputKeyState[dik_code] = new_diks; TRACE(" setting %02X to %02X\n", dik_code, This->DInputKeyState[dik_code]); - dik_code = id_to_offset(&This->base.data_format, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON); EnterCriticalSection(&This->base.crit); - queue_event((LPDIRECTINPUTDEVICE8A)This, dik_code, new_diks, hook->time, This->base.dinput->evsequence++); + queue_event((LPDIRECTINPUTDEVICE8A)This, DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON, + new_diks, hook->time, This->base.dinput->evsequence++); LeaveCriticalSection(&This->base.crit); return ret; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 7b95be3..4809c56 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -324,7 +324,7 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM { /* Already have X, need to queue it */ if (inst_id != -1) - queue_event((LPDIRECTINPUTDEVICE8A)This, id_to_offset(&This->base.data_format, inst_id), + queue_event((LPDIRECTINPUTDEVICE8A)This, inst_id, wdata, GetCurrentTime(), This->base.dinput->evsequence); inst_id = DIDFT_MAKEINSTANCE(WINE_MOUSE_Y_AXIS_INSTANCE) | DIDFT_RELAXIS; wdata = pt1.y; @@ -379,7 +379,7 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM if (inst_id != -1) { _dump_mouse_state(&This->m_state); - queue_event((LPDIRECTINPUTDEVICE8A)This, id_to_offset(&This->base.data_format, inst_id), + queue_event((LPDIRECTINPUTDEVICE8A)This, inst_id, wdata, GetCurrentTime(), This->base.dinput->evsequence++); }

1 0