wine-commits June 2007

wine-commits@winehq.org

5 participants
856 discussions

Jason Edmeades : cmd.exe: Change from main to wmain.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 81c1aa14d526808d3d9fff48e20b852299dae58d URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c1aa14d526808d3d9fff48e… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sun Jun 3 22:07:45 2007 +0100 cmd.exe: Change from main to wmain. --- programs/cmd/Makefile.in | 2 +- programs/cmd/wcmdmain.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/programs/cmd/Makefile.in b/programs/cmd/Makefile.in index c383344..c4e4223 100644 --- a/programs/cmd/Makefile.in +++ b/programs/cmd/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../.. SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = cmd.exe -APPMODE = -mconsole +APPMODE = -mconsole -municode EXTRADEFS = -DUNICODE IMPORTS = shell32 user32 advapi32 kernel32 diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index a5cd510..2a7afe1 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -100,9 +100,8 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start); * winmain(). */ -int main (int argc, char *argv[]) +int wmain (int argc, WCHAR *argvW[]) { - LPWSTR *argvW = NULL; int args; WCHAR *cmd = NULL; WCHAR string[1024]; @@ -121,10 +120,7 @@ int main (int argc, char *argv[]) wsprintf(version_string, WCMD_LoadMessage(WCMD_VERSION), string); strcpyW(anykey, WCMD_LoadMessage(WCMD_ANYKEY)); - /* Get a Unicode command line */ - argvW = CommandLineToArgvW( GetCommandLineW(), &argc ); args = argc; - opt_c=opt_k=opt_q=opt_s=0; while (args > 0) {

1 0

Jason Edmeades : cmd.exe: Fix handling of malformed environment variable expansion.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: c4885bc46f105dbe372beda92503a78ce0cbbb1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4885bc46f105dbe372beda92… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sun Jun 3 22:07:44 2007 +0100 cmd.exe: Fix handling of malformed environment variable expansion. --- programs/cmd/wcmdmain.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index ae27415..a5cd510 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1535,9 +1535,15 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start) { /* Find the end of the environment variable, and extract name */ endOfVar = strchrW(start+1, '%'); if (endOfVar == NULL) { - /* FIXME: Some special conditions here depending on whether + /* In batch program, missing terminator for % and no following + ':' just removes the '%' */ + s = WCMD_strdupW(start + 1); + strcpyW (start, s); + free(s); + + /* FIXME: Some other special conditions here depending on whether in batch, complex or not, and whether env var exists or not! */ - return start+1; + return start; } memcpy(thisVar, start, ((endOfVar - start) + 1) * sizeof(WCHAR)); thisVar[(endOfVar - start)+1] = 0x00;

1 0

Jason Edmeades : cmd.exe: Fix 'help garbage' command post-unicode support.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: afe4d80a5eb08519d962fa309da2a2cc60e55ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe4d80a5eb08519d962fa309… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sun Jun 3 22:07:43 2007 +0100 cmd.exe: Fix 'help garbage' command post-unicode support. --- programs/cmd/builtins.c | 9 +++------ programs/cmd/wcmd.h | 1 + 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index b73e318..f5310b7 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -46,7 +46,7 @@ struct env_stack *saved_environment; struct env_stack *pushd_directories; extern HINSTANCE hinst; -extern WCHAR *inbuilt[]; +extern WCHAR inbuilt[][10]; extern int echo_mode, verify_mode, defaultColor; extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; extern BATCH_CONTEXT *context; @@ -659,19 +659,16 @@ void WCMD_execute (WCHAR *orig_cmd, WCHAR *param, WCHAR *subst) { void WCMD_give_help (WCHAR *command) { int i; - WCHAR buffer[2048]; command = WCMD_strtrim_leading_spaces(command); if (strlenW(command) == 0) { - LoadString (hinst, 1000, buffer, sizeof(buffer)/sizeof(WCHAR)); - WCMD_output_asis (buffer); + WCMD_output_asis (WCMD_LoadMessage(WCMD_ALLHELP)); } else { for (i=0; i<=WCMD_EXIT; i++) { if (CompareString (LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, param1, -1, inbuilt[i], -1) == 2) { - LoadString (hinst, i, buffer, sizeof(buffer)/sizeof(WCHAR)); - WCMD_output_asis (buffer); + WCMD_output_asis (WCMD_LoadMessage(i)); return; } } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 9fe729d..a9abfe6 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -189,6 +189,7 @@ extern WCHAR anykey[]; extern WCHAR version_string[]; /* Translated messages */ +#define WCMD_ALLHELP 1000 #define WCMD_CONFIRM 1001 #define WCMD_YES 1002 #define WCMD_NO 1003

1 0

Jason Edmeades : cmd.exe: Convert cmd to Unicode.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: b8aa5fc5861209db8286566a91173ea8bd4f587e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8aa5fc5861209db8286566a9… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sun Jun 3 22:07:42 2007 +0100 cmd.exe: Convert cmd to Unicode. --- programs/cmd/Cs.rc | 4 + programs/cmd/De.rc | 4 + programs/cmd/En.rc | 4 + programs/cmd/Es.rc | 4 + programs/cmd/Fr.rc | 4 + programs/cmd/Ja.rc | 4 + programs/cmd/Ko.rc | 4 + programs/cmd/Makefile.in | 1 + programs/cmd/Nl.rc | 4 + programs/cmd/No.rc | 4 + programs/cmd/Pl.rc | 4 + programs/cmd/Pt.rc | 4 + programs/cmd/Ru.rc | 4 + programs/cmd/Si.rc | 4 + programs/cmd/Tr.rc | 4 + programs/cmd/batch.c | 189 +++++----- programs/cmd/builtins.c | 861 +++++++++++++++++++++++++--------------------- programs/cmd/directory.c | 323 ++++++++++-------- programs/cmd/wcmd.h | 102 +++--- programs/cmd/wcmdmain.c | 729 ++++++++++++++++++++++++--------------- 20 files changed, 1312 insertions(+), 949 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b8aa5fc5861209db82865…

1 0

Jason Edmeades : cmd.exe: Handle command line as Unicode.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 398e710376a7825cc439ef33a769108a85cb09a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=398e710376a7825cc439ef33a… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sun Jun 3 22:07:41 2007 +0100 cmd.exe: Handle command line as Unicode. --- programs/cmd/wcmd.h | 1 + programs/cmd/wcmdmain.c | 92 ++++++++++++++++++++++++++++++---------------- 2 files changed, 61 insertions(+), 32 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 78db858..ab13595 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -26,6 +26,7 @@ #include <stdarg.h> #include <stdio.h> #include <ctype.h> +#include <wine/unicode.h> void WCMD_assoc (char *, BOOL); void WCMD_batch (char *, char *, int, char *, HANDLE); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d0a08ec..85fe005 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -59,6 +59,9 @@ static char *WCMD_expand_envvar(char *start); int main (int argc, char *argv[]) { + LPWSTR *argvW = NULL; + int args; + WCHAR *cmdW = NULL; char string[1024]; char envvar[4]; char* cmd=NULL; @@ -67,34 +70,44 @@ int main (int argc, char *argv[]) int opt_q; int opt_t = 0; + /* Get a Unicode command line */ + argvW = CommandLineToArgvW( GetCommandLineW(), &argc ); + args = argc; + opt_c=opt_k=opt_q=opt_s=0; - while (*argv!=NULL) + while (args > 0) { - char c; - if ((*argv)[0]!='/' || (*argv)[1]=='\0') { - argv++; + WCHAR c; + WINE_TRACE("Command line parm: '%s'\n", wine_dbgstr_w(*argvW)); + if ((*argvW)[0]!='/' || (*argvW)[1]=='\0') { + argvW++; + args--; continue; } - c=(*argv)[1]; - if (tolower(c)=='c') { + c=(*argvW)[1]; + if (tolowerW(c)=='c') { opt_c=1; - } else if (tolower(c)=='q') { + } else if (tolowerW(c)=='q') { opt_q=1; - } else if (tolower(c)=='k') { + } else if (tolowerW(c)=='k') { opt_k=1; - } else if (tolower(c)=='s') { + } else if (tolowerW(c)=='s') { opt_s=1; - } else if (tolower(c)=='t' && (*argv)[2]==':') { - opt_t=strtoul(&(*argv)[3], NULL, 16); - } else if (tolower(c)=='x' || tolower(c)=='y') { + } else if (tolowerW(c)=='t' && (*argvW)[2]==':') { + opt_t=strtoulW(&(*argvW)[3], NULL, 16); + } else if (tolowerW(c)=='x' || tolowerW(c)=='y') { /* Ignored for compatibility with Windows */ } - if ((*argv)[2]==0) - argv++; + if ((*argvW)[2]==0) { + argvW++; + args--; + } else /* handle `cmd /cnotepad.exe` and `cmd /x/c ...` */ - *argv+=2; + { + *argvW+=2; + } if (opt_c || opt_k) /* break out of parsing immediately after c or k */ break; @@ -105,9 +118,10 @@ int main (int argc, char *argv[]) } if (opt_c || opt_k) { - int len,qcount; - char** arg; - char* p; + int len,qcount; + WCHAR** arg; + int argsLeft; + WCHAR* p; /* opt_s left unflagged if the command starts with and contains exactly * one quoted string (exactly two quote characters). The quoted string @@ -117,10 +131,11 @@ int main (int argc, char *argv[]) /* Build the command to execute */ len = 0; qcount = 0; - for (arg = argv; *arg; arg++) + argsLeft = args; + for (arg = argvW; argsLeft>0; arg++,argsLeft--) { int has_space,bcount; - char* a; + WCHAR* a; has_space=0; bcount=0; @@ -143,7 +158,7 @@ int main (int argc, char *argv[]) } a++; } - len+=(a-*arg)+1 /* for the separating space */; + len+=(a-*arg) + 1; /* for the separating space */ if (has_space) { len+=2; /* for the quotes */ @@ -154,10 +169,10 @@ int main (int argc, char *argv[]) if (qcount!=2) opt_s=1; - /* check argv[0] for a space and invalid characters */ + /* check argvW[0] for a space and invalid characters */ if (!opt_s) { opt_s=1; - p=*argv; + p=*argvW; while (*p!='\0') { if (*p=='&' || *p=='<' || *p=='>' || *p=='(' || *p==')' || *p=='@' || *p=='^' || *p=='|') { @@ -170,15 +185,16 @@ int main (int argc, char *argv[]) } } - cmd = HeapAlloc(GetProcessHeap(), 0, len); - if (!cmd) + cmdW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!cmdW) exit(1); - p = cmd; - for (arg = argv; *arg; arg++) + p = cmdW; + argsLeft = args; + for (arg = argvW; argsLeft>0; arg++,argsLeft--) { int has_space,has_quote; - char* a; + WCHAR* a; /* Check for quotes and spaces in this argument */ has_space=has_quote=0; @@ -202,7 +218,7 @@ int main (int argc, char *argv[]) *p++='"'; if (has_quote) { int bcount; - char* a; + WCHAR* a; bcount=0; a=*arg; @@ -226,17 +242,27 @@ int main (int argc, char *argv[]) a++; } } else { - strcpy(p,*arg); - p+=strlen(*arg); + strcpyW(p,*arg); + p+=strlenW(*arg); } if (has_space) *p++='"'; *p++=' '; } - if (p > cmd) + if (p > cmdW) p--; /* remove last space */ *p = '\0'; + /* FIXME: Convert back to ansi until more is in unicode */ + cmd = HeapAlloc(GetProcessHeap(), 0, len); + if (!cmd) { + exit(1); + } else { + WideCharToMultiByte(CP_ACP, 0, cmdW, len, cmd, len, NULL, NULL); + } + WINE_TRACE("Input (U): '%s'\n", wine_dbgstr_w(cmdW)); + WINE_TRACE("Input (A): '%s'\n", cmd); + /* strip first and last quote characters if opt_s; check for invalid * executable is done later */ if (opt_s && *cmd=='\"') @@ -254,6 +280,7 @@ int main (int argc, char *argv[]) else WCMD_process_command(cmd); HeapFree(GetProcessHeap(), 0, cmd); + HeapFree(GetProcessHeap(), 0, cmdW); return errorlevel; } @@ -338,6 +365,7 @@ int main (int argc, char *argv[]) if (opt_k) { WCMD_process_command(cmd); HeapFree(GetProcessHeap(), 0, cmd); + HeapFree(GetProcessHeap(), 0, cmdW); } /*

1 0

Jason Edmeades : cmd.exe: Move writing to console into a single function.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 926da13e56ade5476069dd9562255b019d9bebf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=926da13e56ade5476069dd956… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sun Jun 3 22:07:40 2007 +0100 cmd.exe: Move writing to console into a single function. --- programs/cmd/wcmdmain.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 32b70f4..d0a08ec 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1193,6 +1193,16 @@ int p = 0; } /******************************************************************* + * WCMD_output_asis_len - send output to current standard output + * device without formatting eg. when message contains '%' + * of a supplied length. + */ +static void WCMD_output_asis_len(const char *message, int len) { + DWORD count; + WriteFile (GetStdHandle(STD_OUTPUT_HANDLE), message, len, &count, NULL); +} + +/******************************************************************* * WCMD_output - send output to current standard output device. * */ @@ -1208,9 +1218,10 @@ void WCMD_output (const char *format, ...) { va_end(ap); if( ret >= sizeof( string)) { WINE_ERR("Output truncated in WCMD_output\n" ); - string[sizeof( string) -1] = '\0'; + ret = sizeof(string) - 1; + string[ret] = '\0'; } - WCMD_output_asis(string); + WCMD_output_asis_len(string, ret); } @@ -1250,22 +1261,20 @@ void WCMD_output_asis (const char *message) { if (paged_mode) { do { if ((ptr = strchr(message, '\n')) != NULL) ptr++; - WriteFile (GetStdHandle(STD_OUTPUT_HANDLE), message, - (ptr) ? ptr - message : lstrlen(message), &count, NULL); + WCMD_output_asis_len(message, (ptr) ? ptr - message : lstrlen(message)); if (ptr) { if (++line_count >= max_height - 1) { - line_count = 0; - WCMD_output_asis (pagedMessage); + line_count = 1; + WCMD_output_asis_len(pagedMessage, lstrlen(pagedMessage)); ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string), &count, NULL); } } } while ((message = ptr) != NULL); } else { - WriteFile (GetStdHandle(STD_OUTPUT_HANDLE), message, lstrlen(message), &count, NULL); + WCMD_output_asis_len(message, lstrlen(message)); } } - /*************************************************************************** * WCMD_strtrim_leading_spaces *

1 0

Jason Edmeades : cmd.exe: Move English constants into NLS files.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 5cc492c78324067a9efbdc8c886aea16ae88bc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cc492c78324067a9efbdc8c8… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Sun Jun 3 22:07:39 2007 +0100 cmd.exe: Move English constants into NLS files. --- programs/cmd/Cs.rc | 24 ++++++++- programs/cmd/De.rc | 24 ++++++++- programs/cmd/En.rc | 24 ++++++++- programs/cmd/Es.rc | 24 ++++++++- programs/cmd/Fr.rc | 24 ++++++++- programs/cmd/Ja.rc | 24 ++++++++- programs/cmd/Ko.rc | 24 ++++++++- programs/cmd/Nl.rc | 24 ++++++++- programs/cmd/No.rc | 24 ++++++++- programs/cmd/Pl.rc | 24 ++++++++- programs/cmd/Pt.rc | 24 ++++++++- programs/cmd/Ru.rc | 24 ++++++++- programs/cmd/Si.rc | 24 ++++++++- programs/cmd/Tr.rc | 24 ++++++++- programs/cmd/batch.c | 21 ++++--- programs/cmd/builtins.c | 141 ++++++++++++++++++++++++---------------------- programs/cmd/directory.c | 6 +- programs/cmd/wcmd.h | 40 ++++++++++--- programs/cmd/wcmdmain.c | 23 ++++++- 19 files changed, 460 insertions(+), 107 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5cc492c78324067a9efbd…

1 0

Mikołaj Zalewski : comctl32: listview: Make LVM_GETCOLUMNWIDTH query the header control instead of using cached data .
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: a1b55be6935a6a3b44fff69eed6dfdee53d217f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1b55be6935a6a3b44fff69ee… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Jun 4 00:26:46 2007 +0200 comctl32: listview: Make LVM_GETCOLUMNWIDTH query the header control instead of using cached data. --- dlls/comctl32/listview.c | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 38f9c18..ba94aec 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -5147,7 +5147,7 @@ static BOOL LISTVIEW_GetColumnOrderArray(const LISTVIEW_INFO *infoPtr, INT iCoun static INT LISTVIEW_GetColumnWidth(const LISTVIEW_INFO *infoPtr, INT nColumn) { INT nColumnWidth = 0; - RECT rcHeader; + HDITEMW hdItem; TRACE("nColumn=%d\n", nColumn); @@ -5158,9 +5158,19 @@ static INT LISTVIEW_GetColumnWidth(const LISTVIEW_INFO *infoPtr, INT nColumn) nColumnWidth = infoPtr->nItemWidth; break; case LVS_REPORT: - if (nColumn < 0 || nColumn >= DPA_GetPtrCount(infoPtr->hdpaColumns)) return 0; - LISTVIEW_GetHeaderRect(infoPtr, nColumn, &rcHeader); - nColumnWidth = rcHeader.right - rcHeader.left; + /* We are not using LISTVIEW_GetHeaderRect as this data is updated only after a HDM_ITEMCHANGED. + * There is an application that subclasses the listview, calls LVM_GETCOLUMNWIDTH in the + * HDM_ITEMCHANGED handler and goes into infinite recursion if it receives old data. + * + * TODO: should we do the same in LVM_GETCOLUMN? + */ + hdItem.mask = HDI_WIDTH; + if (!SendMessageW(infoPtr->hwndHeader, HDM_GETITEMW, nColumn, (LPARAM)&hdItem)) + { + WARN("(%p): HDM_GETITEMW failed for item %d\n", infoPtr->hwndSelf, nColumn); + return 0; + } + nColumnWidth = hdItem.cxy; break; }

1 0

Vitaliy Margolen : dinput: Acquire device only if specified window has focus in foreground coop level .
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: f83b53c160fe194d48c5126b7e6ff1a4256f63c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f83b53c160fe194d48c5126b7… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jun 3 09:09:35 2007 -0600 dinput: Acquire device only if specified window has focus in foreground coop level. --- dlls/dinput/device.c | 2 ++ dlls/dinput/tests/mouse.c | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 5d8c954..b8fc781 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -556,6 +556,8 @@ HRESULT WINAPI IDirectInputDevice2AImpl_Acquire(LPDIRECTINPUTDEVICE8A iface) HRESULT res; if (!This->data_format.user_df) return DIERR_INVALIDPARAM; + if (This->dwCoopLevel & DISCL_FOREGROUND && This->win != GetForegroundWindow()) + return DIERR_OTHERAPPHASPRIO; EnterCriticalSection(&This->crit); res = This->acquired ? S_FALSE : DI_OK; diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index db95ab2..de6bff0 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -72,11 +72,15 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) { HRESULT hr; LPDIRECTINPUTDEVICE pMouse = NULL; + DIMOUSESTATE2 m_state; hr = IDirectInput_CreateDevice(pDI, &GUID_SysMouse, &pMouse, NULL); ok(SUCCEEDED(hr), "IDirectInput_CreateDevice() failed: %s\n", DXGetErrorString8(hr)); if (FAILED(hr)) return; + hr = IDirectInputDevice_SetCooperativeLevel(pMouse, hwnd, DISCL_NONEXCLUSIVE | DISCL_FOREGROUND); + ok(hr == S_OK, "SetCooperativeLevel: %s\n", DXGetErrorString8(hr)); + hr = IDirectInputDevice_SetDataFormat(pMouse, &c_dfDIMouse); ok(SUCCEEDED(hr), "IDirectInputDevice_SetDataFormat() failed: %s\n", DXGetErrorString8(hr)); hr = IDirectInputDevice_Unacquire(pMouse); @@ -86,6 +90,23 @@ static void test_acquire(LPDIRECTINPUT pDI, HWND hwnd) hr = IDirectInputDevice_Acquire(pMouse); ok(hr == S_FALSE, "IDirectInputDevice_Acquire() should have failed: %s\n", DXGetErrorString8(hr)); + /* Foreground coop level requires window to have focus */ + /* This should make dinput loose mouse input */ + SetActiveWindow( 0 ); + + hr = IDirectInputDevice_GetDeviceState(pMouse, sizeof(m_state), &m_state); + todo_wine + ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %s\n", DXGetErrorString8(hr)); + /* Workaround so we can test other things. Remove when Wine is fixed */ + IDirectInputDevice_Unacquire(pMouse); + + hr = IDirectInputDevice_Acquire(pMouse); + ok(hr == DIERR_OTHERAPPHASPRIO, "Acquire() should have failed: %s\n", DXGetErrorString8(hr)); + + SetActiveWindow( hwnd ); + hr = IDirectInputDevice_Acquire(pMouse); + ok(hr == S_OK, "Acquire() failed: %s\n", DXGetErrorString8(hr)); + if (pMouse) IUnknown_Release(pMouse); }

1 0

Vitaliy Margolen : dinput: Make sure to unacquire device before freeing it.
by Alexandre Julliard 04 Jun '07

04 Jun '07

Module: wine Branch: master Commit: 6a8bf96d73bf0a737d148e1b653bca94f4ade310 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8bf96d73bf0a737d148e1b6… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Jun 3 09:09:32 2007 -0600 dinput: Make sure to unacquire device before freeing it. --- dlls/dinput/joystick_linux.c | 2 ++ dlls/dinput/joystick_linuxinput.c | 2 ++ dlls/dinput/keyboard.c | 2 +- dlls/dinput/mouse.c | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 50a5f49..1eafcc7 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -646,6 +646,8 @@ static ULONG WINAPI JoystickAImpl_Release(LPDIRECTINPUTDEVICE8A iface) if (ref) return ref; + IDirectInputDevice_Unacquire(iface); + /* Free the device name */ HeapFree(GetProcessHeap(),0,This->name); diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index bfade84..b41145d 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -516,6 +516,8 @@ static ULONG WINAPI JoystickAImpl_Release(LPDIRECTINPUTDEVICE8A iface) if (ref) return ref; + IDirectInputDevice_Unacquire(iface); + /* Reset the FF state, free all effects, etc */ IDirectInputDevice8_SendForceFeedbackCommand(iface, DISFFC_RESET); diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index a4ba984..df11782 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -281,7 +281,7 @@ static ULONG WINAPI SysKeyboardAImpl_Release(LPDIRECTINPUTDEVICE8A iface) ref = InterlockedDecrement(&This->base.ref); if (ref) return ref; - set_dinput_hook(WH_KEYBOARD_LL, NULL); + IDirectInputDevice_Unacquire(iface); HeapFree(GetProcessHeap(), 0, This->base.data_queue); diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index fcb98bb..ea551ef 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -268,7 +268,7 @@ static ULONG WINAPI SysMouseAImpl_Release(LPDIRECTINPUTDEVICE8A iface) if (ref) return ref; - set_dinput_hook(WH_MOUSE_LL, NULL); + IDirectInputDevice_Unacquire(iface); /* Free the data queue */ HeapFree(GetProcessHeap(), 0, This->base.data_queue);

1 0

← Newer
1
...
76
77
78
79
80
81
82
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2007