September 2011 - Wine-commits

Frédéric Delanoy : cmd: Avoid reading char by char from console.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: a7e1c22a485fb7b87e2c344b472f7e6778d5eafe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7e1c22a485fb7b87e2c344b4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 28 14:41:20 2011 +0200 cmd: Avoid reading char by char from console. --- programs/cmd/batch.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index c5e73c6..5007db3 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -181,13 +181,23 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end) { * the LF (or CRLF) from the line. */ -WCHAR *WCMD_fgets (WCHAR *s, int noChars, HANDLE h) { - - DWORD bytes; +WCHAR *WCMD_fgets (WCHAR *s, int noChars, HANDLE h) +{ + DWORD bytes, charsRead; BOOL status; WCHAR *p; p = s; + if ((status = ReadConsoleW(h, s, noChars, &charsRead, NULL))) { + s[charsRead-2] = '\0'; /* Strip \r\n */ + return p; + } + + /* Continue only if we have no console (i.e. a file) handle */ + if (GetLastError() != ERROR_INVALID_HANDLE) + return NULL; + + /* TODO: More intelligent buffering for reading lines from files */ do { status = WCMD_ReadFile (h, s, 1, &bytes, NULL); if ((status == 0) || ((bytes == 0) && (s == p))) return NULL;

1 0

Frédéric Delanoy : cmd: Avoid checking whether we 're in console mode for every read.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: d6f4f7308ae3de22280c0c3b0b5847180c75e204 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6f4f7308ae3de22280c0c3b0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 28 14:41:21 2011 +0200 cmd: Avoid checking whether we're in console mode for every read. --- programs/cmd/batch.c | 12 +++++------- programs/cmd/builtins.c | 4 ++-- programs/cmd/wcmd.h | 5 +++-- programs/cmd/wcmdmain.c | 21 +++++++++++++-------- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 5007db3..09bb9c4 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -89,7 +89,7 @@ void WCMD_batch (WCHAR *file, WCHAR *command, int called, WCHAR *startLabel, HAN while (context -> skip_rest == FALSE) { CMD_LIST *toExecute = NULL; /* Commands left to be executed */ - if (WCMD_ReadAndParseLine(NULL, &toExecute, h) == NULL) + if (!WCMD_ReadAndParseLine(NULL, &toExecute, h, FALSE)) break; WCMD_process_commands(toExecute, FALSE, NULL, NULL); WCMD_free_commands(toExecute); @@ -181,22 +181,20 @@ WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end) { * the LF (or CRLF) from the line. */ -WCHAR *WCMD_fgets (WCHAR *s, int noChars, HANDLE h) +WCHAR *WCMD_fgets(WCHAR *s, int noChars, HANDLE h, BOOL is_console_handle) { DWORD bytes, charsRead; BOOL status; WCHAR *p; p = s; - if ((status = ReadConsoleW(h, s, noChars, &charsRead, NULL))) { + if (is_console_handle) { + status = ReadConsoleW(h, s, noChars, &charsRead, NULL); + if (!status) return NULL; s[charsRead-2] = '\0'; /* Strip \r\n */ return p; } - /* Continue only if we have no console (i.e. a file) handle */ - if (GetLastError() != ERROR_INVALID_HANDLE) - return NULL; - /* TODO: More intelligent buffering for reading lines from files */ do { status = WCMD_ReadFile (h, s, 1, &bytes, NULL); diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 9fe50d9..b7900fc 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1134,7 +1134,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WCHAR buffer[MAXSTRING] = {'\0'}; WCHAR *where, *parm; - while (WCMD_fgets (buffer, sizeof(buffer)/sizeof(WCHAR), input)) { + while (WCMD_fgets(buffer, sizeof(buffer)/sizeof(WCHAR), input, FALSE)) { /* Skip blank lines*/ parm = WCMD_parameter (buffer, 0, &where, NULL); @@ -1394,7 +1394,7 @@ void WCMD_goto (CMD_LIST **cmdList) { if (*paramStart == ':') paramStart++; SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); - while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h)) { + while (WCMD_fgets (string, sizeof(string)/sizeof(WCHAR), context -> h, FALSE)) { str = string; while (isspaceW (*str)) str++; if (*str == ':') { diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index d370764..5133d20 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -97,7 +97,7 @@ void WCMD_verify (const WCHAR *command); void WCMD_version (void); int WCMD_volume (BOOL set_label, const WCHAR *command); -WCHAR *WCMD_fgets (WCHAR *s, int n, HANDLE stream); +WCHAR *WCMD_fgets (WCHAR *s, int n, HANDLE stream, const BOOL is_console_handle); WCHAR *WCMD_parameter (WCHAR *s, int n, WCHAR **where, WCHAR **end); WCHAR *WCMD_skip_leading_spaces (WCHAR *string); BOOL WCMD_keyword_ws_found(const WCHAR *keyword, int len, const WCHAR *ptr); @@ -111,7 +111,8 @@ void WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int le BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead, const LPOVERLAPPED unused); -WCHAR *WCMD_ReadAndParseLine(const WCHAR *initialcmd, CMD_LIST **output, HANDLE readFrom); +WCHAR *WCMD_ReadAndParseLine(const WCHAR *initialcmd, CMD_LIST **output, + HANDLE readFrom, const BOOL is_console_handle); CMD_LIST *WCMD_process_commands(CMD_LIST *thisCmd, BOOL oneBracket, const WCHAR *var, const WCHAR *val); void WCMD_free_commands(CMD_LIST *cmds); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8e222a3..a6aee38 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1786,8 +1786,9 @@ static BOOL WCMD_IsEndQuote(const WCHAR *quote, int quoteIndex) * - Anything else gets put into the command string (including * redirects) */ -WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE readFrom) { - +WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, + HANDLE readFrom, const BOOL is_console_handle) +{ WCHAR *curPos; int inQuotes = 0; WCHAR curString[MAXSTRING]; @@ -1831,7 +1832,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE } else if (readFrom == INVALID_HANDLE_VALUE) { WINE_FIXME("No command nor handle supplied\n"); } else { - if (WCMD_fgets(extraSpace, MAXSTRING, readFrom) == NULL) return NULL; + if (!WCMD_fgets(extraSpace, MAXSTRING, readFrom, is_console_handle)) + return NULL; } curPos = extraSpace; @@ -2191,7 +2193,8 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Read more, skipping any blank lines */ while (*extraSpace == 0x00) { if (!context) WCMD_output_asis( WCMD_LoadMessage(WCMD_MOREPROMPT)); - if (WCMD_fgets(extraSpace, MAXSTRING, readFrom) == NULL) break; + if (!WCMD_fgets(extraSpace, MAXSTRING, readFrom, is_console_handle)) + break; } curPos = extraSpace; if (context) handleExpansion(extraSpace, FALSE, NULL, NULL); @@ -2282,6 +2285,8 @@ int wmain (int argc, WCHAR *argvW[]) WCHAR string[1024]; WCHAR envvar[4]; int opt_q; + BOOL is_console; + DWORD dummy; int opt_t = 0; static const WCHAR promptW[] = {'P','R','O','M','P','T','\0'}; static const WCHAR defaultpromptW[] = {'$','P','$','G','\0'}; @@ -2497,7 +2502,7 @@ int wmain (int argc, WCHAR *argvW[]) */ /* Parse the command string, without reading any more input */ - WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE); + WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE, FALSE); WCMD_process_commands(toExecute, FALSE, NULL, NULL); WCMD_free_commands(toExecute); toExecute = NULL; @@ -2593,7 +2598,7 @@ int wmain (int argc, WCHAR *argvW[]) if (opt_k) { /* Parse the command string, without reading any more input */ - WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE); + WCMD_ReadAndParseLine(cmd, &toExecute, INVALID_HANDLE_VALUE, FALSE); WCMD_process_commands(toExecute, FALSE, NULL, NULL); WCMD_free_commands(toExecute); toExecute = NULL; @@ -2606,13 +2611,13 @@ int wmain (int argc, WCHAR *argvW[]) SetEnvironmentVariableW(promptW, defaultpromptW); WCMD_version (); + is_console = !!GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &dummy); while (TRUE) { /* Read until EOF (which for std input is never, but if redirect in place, may occur */ if (echo_mode) WCMD_show_prompt(); - if (WCMD_ReadAndParseLine(NULL, &toExecute, - GetStdHandle(STD_INPUT_HANDLE)) == NULL) + if (!WCMD_ReadAndParseLine(NULL, &toExecute, GetStdHandle(STD_INPUT_HANDLE), is_console)) break; WCMD_process_commands(toExecute, FALSE, NULL, NULL); WCMD_free_commands(toExecute);

1 0

Frédéric Delanoy : cmd: Get rid of unused parameter in WCMD_ReadFile.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 29b57ca82d69ef1195c1fd1655d9b42b410b52d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b57ca82d69ef1195c1fd165… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 28 14:41:22 2011 +0200 cmd: Get rid of unused parameter in WCMD_ReadFile. --- programs/cmd/batch.c | 2 +- programs/cmd/builtins.c | 29 +++++++++++------------------ programs/cmd/wcmd.h | 3 +-- programs/cmd/wcmdmain.c | 11 ++++------- 4 files changed, 17 insertions(+), 28 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 09bb9c4..447eccd 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -197,7 +197,7 @@ WCHAR *WCMD_fgets(WCHAR *s, int noChars, HANDLE h, BOOL is_console_handle) /* TODO: More intelligent buffering for reading lines from files */ do { - status = WCMD_ReadFile (h, s, 1, &bytes, NULL); + status = WCMD_ReadFile(h, s, 1, &bytes); if ((status == 0) || ((bytes == 0) && (s == p))) return NULL; if (*s == '\n') bytes = 0; else if (*s != '\r') { diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index b7900fc..ca0d4fe 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -115,8 +115,7 @@ static BOOL WCMD_ask_confirm (const WCHAR *message, BOOL showSureText, WCMD_output_asis (Abuffer); } WCMD_output_asis (endBkt); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), answer, - sizeof(answer)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, sizeof(answer)/sizeof(WCHAR), &count); answer[0] = toupperW(answer[0]); } @@ -306,7 +305,7 @@ void WCMD_choice (const WCHAR * command) { while (TRUE) { /* FIXME: Add support for option /T */ - WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count); if (!opt_s) answer[0] = toupperW(answer[0]); @@ -1697,8 +1696,7 @@ void WCMD_pause (void) { WCHAR string[32]; WCMD_output (anykey); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, - sizeof(string)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); } /**************************************************************************** @@ -2146,8 +2144,7 @@ void WCMD_setshow_date (void) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTDATE), curdate); if (strstrW (quals, parmT) == NULL) { WCMD_output (WCMD_LoadMessage(WCMD_NEWDATE)); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), - buffer, sizeof(buffer)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); if (count > 2) { WCMD_output (WCMD_LoadMessage(WCMD_NYI)); } @@ -2265,8 +2262,7 @@ void WCMD_setshow_env (WCHAR *s) { if (strlenW(p) != 0) WCMD_output(p); /* Read the reply */ - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, - sizeof(string)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); if (count > 1) { string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ @@ -2376,8 +2372,7 @@ void WCMD_setshow_time (void) { WCMD_output (WCMD_LoadMessage(WCMD_CURRENTTIME), curtime); if (strstrW (quals, parmT) == NULL) { WCMD_output (WCMD_LoadMessage(WCMD_NEWTIME)); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), buffer, - sizeof(buffer)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); if (count > 2) { WCMD_output (WCMD_LoadMessage(WCMD_NYI)); } @@ -2474,7 +2469,7 @@ void WCMD_type (WCHAR *command) { static const WCHAR fmt[] = {'\n','%','s','\n','\n','\0'}; WCMD_output(fmt, thisArg); } - while (WCMD_ReadFile (h, buffer, sizeof(buffer)/sizeof(WCHAR) - 1, &count, NULL)) { + while (WCMD_ReadFile(h, buffer, sizeof(buffer)/sizeof(WCHAR) - 1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ buffer[count] = 0; WCMD_output_asis (buffer); @@ -2528,7 +2523,7 @@ void WCMD_more (WCHAR *command) { wsprintfW(moreStrPage, moreFmt, moreStr); WCMD_enter_paged_mode(moreStrPage); - while (WCMD_ReadFile (hstdin, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count, NULL)) { + while (WCMD_ReadFile(hstdin, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ buffer[count] = 0; WCMD_output_asis (buffer); @@ -2559,8 +2554,7 @@ void WCMD_more (WCHAR *command) { wsprintfW(moreStrPage, moreFmt2, moreStr, 100); WCMD_leave_paged_mode(); WCMD_output_asis(moreStrPage); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), buffer, - sizeof(buffer)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer)/sizeof(WCHAR), &count); WCMD_enter_paged_mode(moreStrPage); } @@ -2582,7 +2576,7 @@ void WCMD_more (WCHAR *command) { fileLen = (((ULONG64)fileInfo.nFileSizeHigh) << 32) + fileInfo.nFileSizeLow; needsPause = TRUE; - while (WCMD_ReadFile (h, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count, NULL)) { + while (WCMD_ReadFile(h, buffer, (sizeof(buffer)/sizeof(WCHAR))-1, &count)) { if (count == 0) break; /* ReadFile reports success on EOF! */ buffer[count] = 0; curPos += count; @@ -2683,8 +2677,7 @@ int WCMD_volume(BOOL set_label, const WCHAR *path) curdir[0], label, HIWORD(serial), LOWORD(serial)); if (set_label) { WCMD_output (WCMD_LoadMessage(WCMD_VOLUMEPROMPT)); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, - sizeof(string)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); if (count > 1) { string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 5133d20..98e1246 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -108,8 +108,7 @@ void WCMD_opt_s_strip_quotes(WCHAR *cmd); WCHAR *WCMD_LoadMessage(UINT id); WCHAR *WCMD_strdupW(const WCHAR *input); void WCMD_strsubstW(WCHAR *start, const WCHAR* next, const WCHAR* insert, int len); -BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, - LPDWORD charsRead, const LPOVERLAPPED unused); +BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead); WCHAR *WCMD_ReadAndParseLine(const WCHAR *initialcmd, CMD_LIST **output, HANDLE readFrom, const BOOL is_console_handle); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index a6aee38..3f2cfcf 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -237,11 +237,9 @@ void WCMD_leave_paged_mode(void) * WCMD_Readfile * * Read characters in from a console/file, returning result in Unicode - * with signature identical to ReadFile */ -BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, - LPDWORD charsRead, const LPOVERLAPPED unused) { - +BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, LPDWORD charsRead) +{ BOOL res; /* Try to read from console as Unicode */ @@ -258,7 +256,7 @@ BOOL WCMD_ReadFile(const HANDLE hIn, WCHAR *intoBuf, const DWORD maxChars, return FALSE; /* Read from file (assume OEM codepage) */ - res = ReadFile(hIn, buffer, maxChars, &numRead, unused); + res = ReadFile(hIn, buffer, maxChars, &numRead, NULL); /* Convert from OEM */ *charsRead = MultiByteToWideChar(GetConsoleCP(), 0, buffer, numRead, @@ -293,8 +291,7 @@ static void WCMD_output_asis_handle (DWORD std_handle, const WCHAR *message) { if (++line_count >= max_height - 1) { line_count = 0; WCMD_output_asis_len(pagedMessage, strlenW(pagedMessage), handle); - WCMD_ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, - sizeof(string)/sizeof(WCHAR), &count, NULL); + WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string)/sizeof(WCHAR), &count); } } } while (((message = ptr) != NULL) && (*ptr));

1 0

Frédéric Delanoy : cmd/tests: Don' t convert lines with DOS endings in convert_input_data.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: f00aafae856c430a1663c8f27dca2f2ee3b4ca84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f00aafae856c430a1663c8f27… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 28 12:53:49 2011 +0200 cmd/tests: Don't convert lines with DOS endings in convert_input_data. --- programs/cmd/tests/batch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 58d75c3..8347c03 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -47,7 +47,8 @@ static const char* convert_input_data(const char *data, DWORD size, DWORD *new_s for (i = 0; i < size; i++) { switch (data[i]) { case '\n': - *ptr++ = '\r'; + if (data[i-1] != '\r') + *ptr++ = '\r'; *ptr++ = '\n'; break; case '@':

1 0

Francois Gouget : browseui/tests: Skip some tests if IEnumACString is not supported.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 80d8275f814ac44f974e96dc805c896f795becb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80d8275f814ac44f974e96dc8… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Sep 28 17:37:24 2011 +0200 browseui/tests: Skip some tests if IEnumACString is not supported. --- dlls/browseui/tests/autocomplete.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index bd2117e..120a5b0 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -238,6 +238,7 @@ static void test_ACLMulti(void) WCHAR exp[] = {'A','B','C',0}; IEnumString *obj; IEnumACString *unk; + HRESULT hr; TestACL *acl1, *acl2; IACList *acl; IObjMgr *mgr; @@ -252,9 +253,15 @@ static void test_ACLMulti(void) "Unexpected interface IACList2 in ACLMulti\n"); stop_on_error(obj->lpVtbl->QueryInterface(obj, &IID_IObjMgr, (LPVOID *)&mgr)); - todo_wine ole_ok(obj->lpVtbl->QueryInterface(obj, &IID_IEnumACString, (LPVOID*)&unk)); - if (unk != NULL) - unk->lpVtbl->Release(unk); + hr = obj->lpVtbl->QueryInterface(obj, &IID_IEnumACString, (LPVOID*)&unk); + if (hr == E_NOINTERFACE) + todo_wine win_skip("IEnumACString is not supported, skipping tests\n"); + else + { + ok(hr == S_OK, "QueryInterface(IID_IEnumACString) failed: %x\n", hr); + if (unk != NULL) + unk->lpVtbl->Release(unk); + } ok(obj->lpVtbl->Next(obj, 1, (LPOLESTR *)&tmp, &i) == S_FALSE, "Unexpected return from Next\n"); ok(i == 0, "Unexpected fetched value %d\n", i);

1 0

Andrew Eikum : mmdevapi: Don't fail if dwChannelMask is not set correctly.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: f7364dfb4b203b74700eead1836e208a49872244 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7364dfb4b203b74700eead18… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Sep 28 13:31:40 2011 -0500 mmdevapi: Don't fail if dwChannelMask is not set correctly. --- dlls/mmdevapi/tests/render.c | 41 +++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 1 + dlls/winecoreaudio.drv/mmdevdrv.c | 6 +++++ dlls/wineoss.drv/mmdevdrv.c | 9 ++++--- 4 files changed, 53 insertions(+), 4 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index ce5247d..494c00d 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -220,6 +220,47 @@ static void test_audioclient(void) NULL, (void**)&ac); ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)pwfx; + WAVEFORMATEX *fmt2 = NULL; + + ok(fmtex->dwChannelMask != 0, "Got empty dwChannelMask\n"); + + fmtex->dwChannelMask = 0xffff; + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); + ok(hr == S_OK, "Initialize(dwChannelMask = 0xffff) returns %08x\n", hr); + + IAudioClient_Release(ac); + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + + fmtex->dwChannelMask = 0; + + hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &fmt2); + ok(hr == S_OK, "IsFormatSupported(dwChannelMask = 0) call returns %08x\n", hr); + ok(fmtex->dwChannelMask == 0, "Passed format was modified\n"); + + CoTaskMemFree(fmt2); + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); + ok(hr == S_OK, "Initialize(dwChannelMask = 0) returns %08x\n", hr); + + IAudioClient_Release(ac); + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + + CoTaskMemFree(pwfx); + + hr = IAudioClient_GetMixFormat(ac, &pwfx); + ok(hr == S_OK, "Valid GetMixFormat returns %08x\n", hr); + }else + skip("Skipping dwChannelMask tests\n"); + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == S_OK, "Valid Initialize returns %08x\n", hr); diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index af367ba..e1f1a49 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1383,6 +1383,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = mask; if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->dwChannelMask != 0 && fmtex->dwChannelMask != mask) hr = S_FALSE; } diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index be4ae84..26c154f 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1118,6 +1118,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, WAVEFORMATEX **outpwfx) { ACImpl *This = impl_from_IAudioClient(iface); + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)pwfx; AudioQueueRef aqueue; HRESULT hr; @@ -1135,6 +1136,11 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); + if(pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->dwChannelMask != 0 && + fmtex->dwChannelMask != get_channel_mask(pwfx->nChannels)) + return AUDCLNT_E_UNSUPPORTED_FORMAT; + OSSpinLockLock(&This->lock); hr = ca_setup_aqueue(This->adevid, This->dataflow, pwfx, NULL, &aqueue); diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c34d809..8d1a997 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -668,7 +668,7 @@ static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) } static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, - WAVEFORMATEX **out) + WAVEFORMATEX **out, BOOL query) { int tmp, oss_format; double tenth; @@ -723,7 +723,8 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, ((WAVEFORMATEXTENSIBLE*)closest)->dwChannelMask = mask; - if(fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + if(query && fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + fmtex->dwChannelMask != 0 && fmtex->dwChannelMask != mask) ret = S_FALSE; } @@ -861,7 +862,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - hr = setup_oss_device(This, fmt, NULL); + hr = setup_oss_device(This, fmt, NULL, FALSE); if(hr == S_FALSE){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_UNSUPPORTED_FORMAT; @@ -1099,7 +1100,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, EnterCriticalSection(&This->lock); - ret = setup_oss_device(This, pwfx, outpwfx); + ret = setup_oss_device(This, pwfx, outpwfx, TRUE); LeaveCriticalSection(&This->lock);

1 0

Andrew Eikum : wineoss.drv: Use a temporary OSS device to check format support.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: fdda702acd1a9ace6925845ec50edcf5e1023c79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdda702acd1a9ace6925845ec… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Sep 28 13:32:03 2011 -0500 wineoss.drv: Use a temporary OSS device to check format support. --- dlls/wineoss.drv/mmdevdrv.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 8d1a997..5de0a15 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -667,7 +667,7 @@ static WAVEFORMATEX *clone_format(const WAVEFORMATEX *fmt) return ret; } -static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, +static HRESULT setup_oss_device(int fd, const WAVEFORMATEX *fmt, WAVEFORMATEX **out, BOOL query) { int tmp, oss_format; @@ -682,7 +682,7 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, tmp = oss_format = get_oss_format(fmt); if(oss_format < 0) return AUDCLNT_E_UNSUPPORTED_FORMAT; - if(ioctl(This->fd, SNDCTL_DSP_SETFMT, &tmp) < 0){ + if(ioctl(fd, SNDCTL_DSP_SETFMT, &tmp) < 0){ WARN("SETFMT failed: %d (%s)\n", errno, strerror(errno)); return E_FAIL; } @@ -696,7 +696,7 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, return E_OUTOFMEMORY; tmp = fmt->nSamplesPerSec; - if(ioctl(This->fd, SNDCTL_DSP_SPEED, &tmp) < 0){ + if(ioctl(fd, SNDCTL_DSP_SPEED, &tmp) < 0){ WARN("SPEED failed: %d (%s)\n", errno, strerror(errno)); CoTaskMemFree(closest); return E_FAIL; @@ -708,7 +708,7 @@ static HRESULT setup_oss_device(ACImpl *This, const WAVEFORMATEX *fmt, } tmp = fmt->nChannels; - if(ioctl(This->fd, SNDCTL_DSP_CHANNELS, &tmp) < 0){ + if(ioctl(fd, SNDCTL_DSP_CHANNELS, &tmp) < 0){ WARN("CHANNELS failed: %d (%s)\n", errno, strerror(errno)); CoTaskMemFree(closest); return E_FAIL; @@ -862,7 +862,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } - hr = setup_oss_device(This, fmt, NULL, FALSE); + hr = setup_oss_device(This->fd, fmt, NULL, FALSE); if(hr == S_FALSE){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_UNSUPPORTED_FORMAT; @@ -1082,6 +1082,7 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, WAVEFORMATEX **outpwfx) { ACImpl *This = impl_from_IAudioClient(iface); + int fd = -1; HRESULT ret; TRACE("(%p)->(%x, %p, %p)\n", This, mode, pwfx, outpwfx); @@ -1098,11 +1099,20 @@ static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient *iface, dump_fmt(pwfx); - EnterCriticalSection(&This->lock); + if(This->dataflow == eRender) + fd = open(This->ai.devnode, O_WRONLY, 0); + else if(This->dataflow == eCapture) + fd = open(This->ai.devnode, O_RDONLY, 0); + + if(fd < 0){ + ERR("Unable to open device %s: %d (%s)\n", This->ai.devnode, errno, + strerror(errno)); + return AUDCLNT_E_DEVICE_INVALIDATED; + } - ret = setup_oss_device(This, pwfx, outpwfx, TRUE); + ret = setup_oss_device(fd, pwfx, outpwfx, TRUE); - LeaveCriticalSection(&This->lock); + close(fd); return ret; }

1 0

Dmitry Timoshkov : ntdll: Use STATUS_INVALID_PAGE_PROTECTION as return value for invalid protections .
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 988307e87b67560ece29cb3c4c94e978fc8cfc46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=988307e87b67560ece29cb3c4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 28 14:47:06 2011 +0900 ntdll: Use STATUS_INVALID_PAGE_PROTECTION as return value for invalid protections. --- dlls/ntdll/virtual.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 10fba17..5e69eb9 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -584,7 +584,7 @@ static NTSTATUS get_vprot_flags( DWORD protect, unsigned int *vprot ) *vprot = 0; break; default: - return STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PAGE_PROTECTION; } if (protect & PAGE_GUARD) *vprot |= VPROT_GUARD; if (protect & PAGE_NOCACHE) *vprot |= VPROT_NOCACHE; @@ -2501,7 +2501,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p access = SECTION_MAP_READ; break; default: - return STATUS_INVALID_PARAMETER; + return STATUS_INVALID_PAGE_PROTECTION; } if (process != NtCurrentProcess())

1 0

Andrew Eikum : dsound: Eliminate leftover driver structures.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 6c33e8725966c31857a67771e3fde283ec4d1787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c33e8725966c31857a67771e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 27 15:19:04 2011 -0500 dsound: Eliminate leftover driver structures. --- dlls/dsound/capture.c | 2 - dlls/dsound/dsound.c | 6 +--- dlls/dsound/dsound_private.h | 58 +---------------------------------------- dlls/dsound/primary.c | 1 - 4 files changed, 4 insertions(+), 63 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 9a56e65..7569254 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1029,8 +1029,6 @@ static HRESULT DirectSoundCaptureDevice_Initialize( device->mmdevice = mmdevice; - device->drvdesc.dwFlags = 0; - device->drvcaps.dwFlags = 0; device->drvcaps.dwFormats = 0; diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 49b39a1..8006f5d 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -1335,10 +1335,8 @@ HRESULT DirectSoundDevice_GetCaps( lpDSCaps->dwTotalHwMemBytes = device->drvcaps.dwTotalHwMemBytes; lpDSCaps->dwFreeHwMemBytes = device->drvcaps.dwFreeHwMemBytes; lpDSCaps->dwMaxContigFreeHwMemBytes = device->drvcaps.dwMaxContigFreeHwMemBytes; - - /* driver doesn't have these */ - lpDSCaps->dwUnlockTransferRateHwBuffers = 4096; /* But we have none... */ - lpDSCaps->dwPlayCpuOverheadSwBuffers = 1; /* 1% */ + lpDSCaps->dwUnlockTransferRateHwBuffers = device->drvcaps.dwUnlockTransferRateHwBuffers; + lpDSCaps->dwPlayCpuOverheadSwBuffers = device->drvcaps.dwPlayCpuOverheadSwBuffers; return DS_OK; } diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index b6f7e7d..075f914 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -65,47 +65,6 @@ extern const mixfunc mixfunctions[4] DECLSPEC_HIDDEN; typedef void (*normfunc)(const void *, void *, unsigned); extern const normfunc normfunctions[4] DECLSPEC_HIDDEN; -typedef struct _DSDRIVERDESC -{ - DWORD dwFlags; - CHAR szDesc[256]; - CHAR szDrvname[256]; - DWORD dnDevNode; - WORD wVxdId; - WORD wReserved; - ULONG ulDeviceNum; - DWORD dwHeapType; - LPVOID pvDirectDrawHeap; - DWORD dwMemStartAddress; - DWORD dwMemEndAddress; - DWORD dwMemAllocExtra; - LPVOID pvReserved1; - LPVOID pvReserved2; -} DSDRIVERDESC,*PDSDRIVERDESC; - -typedef struct _DSDRIVERCAPS -{ - DWORD dwFlags; - DWORD dwMinSecondarySampleRate; - DWORD dwMaxSecondarySampleRate; - DWORD dwPrimaryBuffers; - DWORD dwMaxHwMixingAllBuffers; - DWORD dwMaxHwMixingStaticBuffers; - DWORD dwMaxHwMixingStreamingBuffers; - DWORD dwFreeHwMixingAllBuffers; - DWORD dwFreeHwMixingStaticBuffers; - DWORD dwFreeHwMixingStreamingBuffers; - DWORD dwMaxHw3DAllBuffers; - DWORD dwMaxHw3DStaticBuffers; - DWORD dwMaxHw3DStreamingBuffers; - DWORD dwFreeHw3DAllBuffers; - DWORD dwFreeHw3DStaticBuffers; - DWORD dwFreeHw3DStreamingBuffers; - DWORD dwTotalHwMemBytes; - DWORD dwFreeHwMemBytes; - DWORD dwMaxContigFreeHwMemBytes; -} DSDRIVERCAPS,*PDSDRIVERCAPS; - typedef struct _DSVOLUMEPAN { DWORD dwTotalLeftAmpFactor; @@ -117,14 +76,6 @@ typedef struct _DSVOLUMEPAN DWORD dwPanRightAmpFactor; } DSVOLUMEPAN,*PDSVOLUMEPAN; -typedef struct _DSCDRIVERCAPS -{ - DWORD dwSize; - DWORD dwFlags; - DWORD dwFormats; - DWORD dwChannels; -} DSCDRIVERCAPS,*PDSCDRIVERCAPS; - /***************************************************************************** * IDirectSoundDevice implementation structure */ @@ -133,8 +84,7 @@ struct DirectSoundDevice LONG ref; GUID guid; - DSDRIVERDESC drvdesc; - DSDRIVERCAPS drvcaps; + DSCAPS drvcaps; DWORD priolevel; PWAVEFORMATEX pwfx; UINT timerID, pwplay, pwqueue, prebuf, helfrags; @@ -272,15 +222,11 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; */ struct DirectSoundCaptureDevice { - /* IDirectSoundCaptureImpl fields */ GUID guid; LONG ref; - /* DirectSound driver stuff */ - DSDRIVERDESC drvdesc; - DSCDRIVERCAPS drvcaps; + DSCCAPS drvcaps; - /* more stuff */ LPBYTE buffer; DWORD buflen, write_pos_bytes; diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index 24db07d..7243cc6 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -105,7 +105,6 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) device->volume = NULL; } - device->drvdesc.dwFlags = 0; hres = IMMDevice_Activate(device->mmdevice, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void **)&device->client); if(FAILED(hres)){

1 0

Aurimas Fišeras : winecfg: Update Lithuanian translation.
by Alexandre Julliard 28 Sep '11

28 Sep '11

Module: wine Branch: master Commit: 27cca60115c0474c31cf1fe524515efd4a6b2c50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27cca60115c0474c31cf1fe52… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Sep 27 22:43:07 2011 +0300 winecfg: Update Lithuanian translation. --- programs/winecfg/Lt.rc | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index 6b4fe6b..14243b9 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -56,7 +56,7 @@ BEGIN 15,50,230,120 PUSHBUTTON "&Pridėti programą...",IDC_APP_ADDAPP, 90,174,75,14 PUSHBUTTON "Pa&šalinti programą",IDC_APP_REMOVEAPP, 170,174,75,14 - LTEXT "&Windows versija:",IDC_STATIC,17,196,58,8 + LTEXT "Windows &versija:",IDC_STATIC,17,196,58,8 COMBOBOX IDC_WINVER,83,194,163,56,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END @@ -67,7 +67,7 @@ BEGIN GROUPBOX " Langų nuostatos ",IDC_STATIC,8,4,244,84 CONTROL "Automatiškai &užvaldyti pelę viso ekrano languose",IDC_FULLSCREEN_GRAB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,20,230,8 CONTROL "Leisti langų tvarkytuvei &dekoruoti langus",IDC_ENABLE_DECORATED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,32,230,8 - CONTROL "Leisti langų tvarkytuvei kontroliuoti &langus",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 + CONTROL "Leisti langų tvarkytuvei &kontroliuoti langus",IDC_ENABLE_MANAGED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,8 CONTROL "&Emuliuoti virtualų darbalaukį",IDC_ENABLE_DESKTOP,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,15,56,230,8 LTEXT "Darbalaukio d&ydis:",IDC_DESKTOP_SIZE,15,70,60,8,WS_DISABLED @@ -76,7 +76,7 @@ BEGIN EDITTEXT IDC_DESKTOP_HEIGHT,133,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED GROUPBOX " Direct3D ",IDC_STATIC,8,95,244,49 - LTEXT "Verte&x Shader palaikymas: ",IDC_STATIC,15,110,90,32 + LTEXT "&Vertex Shader palaikymas: ",IDC_STATIC,15,110,90,32 COMBOBOX IDC_D3D_VSHADER_MODE,110,108,135,70,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "Leisti &Pixel Shader (jei palaiko aparatinė įranga)",IDC_D3D_PSHADER_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,126,230,10 @@ -109,11 +109,11 @@ CAPTION "Redaguoti nustelbimą" FONT 8, "MS Shell Dlg" BEGIN GROUPBOX " Įkėlimo tvarka ",IDC_STATIC,8,4,94,66 - CONTROL "&Įtaisyta (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,16,14,75,10 - CONTROL "&Sava (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,16,24,75,10 - CONTROL "Į&taisyta po to sava",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,16,34,75,10 - CONTROL "S&ava po to įtaisyta",IDC_RAD_NATIVE_BUILTIN,"Button", BS_AUTORADIOBUTTON,16,44,75,10 - CONTROL "&Išjungti",IDC_RAD_DISABLE,"Button", BS_AUTORADIOBUTTON,16,54,75,10 + CONTROL "&Įtaisyta (Wine)",IDC_RAD_BUILTIN,"Button", BS_AUTORADIOBUTTON | WS_GROUP,16,14,80,10 + CONTROL "&Sava (Windows)",IDC_RAD_NATIVE,"Button", BS_AUTORADIOBUTTON,16,24,80,10 + CONTROL "Į&taisyta, po to sava",IDC_RAD_BUILTIN_NATIVE,"Button", BS_AUTORADIOBUTTON,16,34,80,10 + CONTROL "S&ava, po to įtaisyta",IDC_RAD_NATIVE_BUILTIN,"Button", BS_AUTORADIOBUTTON,16,44,80,10 + CONTROL "&Išjungti",IDC_RAD_DISABLE,"Button", BS_AUTORADIOBUTTON,16,54,80,10 DEFPUSHBUTTON "Gerai",IDOK,8,74,45,14,WS_GROUP PUSHBUTTON "Atsisakyti",IDCANCEL,57,74,45,14,WS_GROUP END @@ -165,7 +165,7 @@ IDD_AUDIOCFG DIALOG 0, 0, 260, 220 STYLE WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX " Driver Diagnostics ",IDC_STATIC,8,4,244,27 + GROUPBOX " Tvarkyklės diagnostika ",IDC_STATIC,8,4,244,27 LTEXT "",IDC_AUDIO_DRIVER,18,16,230,8 PUSHBUTTON "&Testuoti garsą",IDC_AUDIO_TEST,8,33,63,14 END

1 0