October 2008 - Wine-Commits

Paul Vriens : kernel32/tests: Skip a test if needed.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 61b84b0862d50e2af9422e37bd206953667ff5ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b84b0862d50e2af9422e37b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 22 13:01:25 2008 +0200 kernel32/tests: Skip a test if needed. --- dlls/kernel32/tests/volume.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 1fa53da..0229a82 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -187,7 +187,12 @@ static void test_GetLogicalDriveStringsW(void) return; } + SetLastError(0xdeadbeef); size = pGetLogicalDriveStringsW(0, NULL); + if (size == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { + win_skip("GetLogicalDriveStringsW not implemented\n"); + return; + } ok(size%4 == 1, "size = %d\n", size); buf = HeapAlloc(GetProcessHeap(), 0, size*sizeof(WCHAR));

1 0

Paul Vriens : kernel32/tests: Fix a few failures on win9x and winme.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: dda38adce5c0936b8a3b9ed397e6286ac216c702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda38adce5c0936b8a3b9ed39… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 22 12:31:51 2008 +0200 kernel32/tests: Fix a few failures on win9x and winme. --- dlls/kernel32/tests/volume.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 14fcade..1fa53da 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -165,7 +165,9 @@ static void test_GetLogicalDriveStringsA(void) ok(size2 == size-1, "size2 = %d\n", size2); for(ptr = buf; ptr < buf+size2; ptr += 4) { - ok('A' <= *ptr && *ptr <= 'Z', "device name '%c' is not uppercase\n", *ptr); + ok(('A' <= *ptr && *ptr <= 'Z') || + (broken('a' <= *ptr && *ptr <= 'z')), /* Win9x and WinMe */ + "device name '%c' is not uppercase\n", *ptr); ok(ptr[1] == ':', "ptr[1] = %c, expected ':'\n", ptr[1]); ok(ptr[2] == '\\', "ptr[2] = %c expected '\\'\n", ptr[2]); ok(!ptr[3], "ptr[3] = %c expected nullbyte\n", ptr[3]);

1 0

Dylan Smith : richedit: Fixed EM_POSFROMCHAR for pos of text length.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 46d79b0363494426d1c41cb1eccd88f0926d83b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46d79b0363494426d1c41cb1e… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Oct 22 02:22:41 2008 -0400 richedit: Fixed EM_POSFROMCHAR for pos of text length. For some reason EM_POSFROMCHAR was returning 0 when the position was equal to the end of the text, or beyond the end of the text. Instead it should use the position at the end of the text for both these cases. The x value was also seen to be offset by 1 according to the tests. --- dlls/riched20/editor.c | 19 ++++++++----------- dlls/riched20/tests/editor.c | 6 +----- dlls/riched32/tests/editor.c | 4 ---- 3 files changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index a4a26cc..d92397e 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3543,18 +3543,15 @@ static LRESULT RichEditWndProc_common(HWND hWnd, UINT msg, WPARAM wParam, if (wParam >= 0x40000) nCharOfs = lParam; nLength = ME_GetTextLength(editor); - - if (nCharOfs < nLength) { - ME_RunOfsFromCharOfs(editor, nCharOfs, &pRun, &nOffset); - assert(pRun->type == diRun); - pt.y = pRun->member.run.pt.y; - pt.x = pRun->member.run.pt.x + ME_PointFromChar(editor, &pRun->member.run, nOffset); - pt.y += ME_GetParagraph(pRun)->member.para.pt.y; - } else { - pt.x = 0; - pt.y = editor->pBuffer->pLast->member.para.pt.y; - } + nCharOfs = min(nCharOfs, nLength); + + ME_RunOfsFromCharOfs(editor, nCharOfs, &pRun, &nOffset); + assert(pRun->type == diRun); + pt.y = pRun->member.run.pt.y; + pt.x = pRun->member.run.pt.x + ME_PointFromChar(editor, &pRun->member.run, nOffset); + pt.y += ME_GetParagraph(pRun)->member.para.pt.y; pt.x += editor->selofs; + pt.x++; /* for some reason native offsets x by one */ si.cbSize = sizeof(si); si.fMask = SIF_POS; diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index d57aab0..a6c4a82 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -567,9 +567,7 @@ static void test_EM_POSFROMCHAR(void) if (i == 0) { ok(HIWORD(result) == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", HIWORD(result)); - todo_wine { ok(LOWORD(result) == 1, "EM_POSFROMCHAR reports x=%d, expected 1\n", LOWORD(result)); - } xpos = LOWORD(result); } else if (i == 1) @@ -623,9 +621,7 @@ static void test_EM_POSFROMCHAR(void) result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, 0, 0); ok(HIWORD(result) == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", HIWORD(result)); - todo_wine { ok(LOWORD(result) == 1, "EM_POSFROMCHAR reports x=%d, expected 1\n", LOWORD(result)); - } xpos = LOWORD(result); SendMessage(hwndRichEdit, WM_HSCROLL, SB_LINERIGHT, 0); @@ -647,7 +643,7 @@ static void test_EM_POSFROMCHAR(void) xpos = pt.x; SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, SendMessage(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0)); - todo_wine ok(pt.x > xpos, "pt.x = %d\n", pt.x); + ok(pt.x > xpos, "pt.x = %d\n", pt.x); xpos = pt.x; SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, SendMessage(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0)+1); diff --git a/dlls/riched32/tests/editor.c b/dlls/riched32/tests/editor.c index 1d07b8d..2bf44f9 100644 --- a/dlls/riched32/tests/editor.c +++ b/dlls/riched32/tests/editor.c @@ -742,9 +742,7 @@ static void test_EM_POSFROMCHAR(void) if (i == 0) { ok(pl.y == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", pl.y); - todo_wine { ok(pl.x == 1, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); - } xpos = pl.x; } else if (i == 1) @@ -805,9 +803,7 @@ static void test_EM_POSFROMCHAR(void) result = SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pl, 0); ok(result == 0, "EM_POSFROMCHAR returned %ld, expected 0\n", result); ok(pl.y == 0, "EM_POSFROMCHAR reports y=%d, expected 0\n", pl.y); - todo_wine { ok(pl.x == 1, "EM_POSFROMCHAR reports x=%d, expected 1\n", pl.x); - } xpos = pl.x; SendMessage(hwndRichEdit, WM_HSCROLL, SB_LINERIGHT, 0);

1 0

Dylan Smith : richedit: Added tests for EM_POSFROMCHAR for pos around end of text.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 31951a099da7adc494a931ba29633dca8a97a144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31951a099da7adc494a931ba2… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Oct 22 02:22:20 2008 -0400 richedit: Added tests for EM_POSFROMCHAR for pos around end of text. --- dlls/riched20/tests/editor.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 14bfb6d..d57aab0 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -529,6 +529,7 @@ static void test_EM_POSFROMCHAR(void) LRESULT result; unsigned int height = 0; int xpos = 0; + POINTL pt; static const char text[] = "aa\n" "this is a long line of text that should be longer than the " "control's width\n" @@ -636,6 +637,22 @@ static void test_EM_POSFROMCHAR(void) "EM_POSFROMCHAR reports x=%hd, expected value less than %d\n", (signed short)(LOWORD(result)), xpos); } + SendMessage(hwndRichEdit, WM_HSCROLL, SB_LINELEFT, 0); + + /* Test around end of text that doesn't end in a newline. */ + SendMessage(hwndRichEdit, WM_SETTEXT, 0, (LPARAM) "12345678901234"); + SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, + SendMessage(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0)-1); + ok(pt.x > 1, "pt.x = %d\n", pt.x); + xpos = pt.x; + SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, + SendMessage(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0)); + todo_wine ok(pt.x > xpos, "pt.x = %d\n", pt.x); + xpos = pt.x; + SendMessage(hwndRichEdit, EM_POSFROMCHAR, (WPARAM)&pt, + SendMessage(hwndRichEdit, WM_GETTEXTLENGTH, 0, 0)+1); + ok(pt.x == xpos, "pt.x = %d\n", pt.x); + DestroyWindow(hwndRichEdit); }

1 0

Andrew Talbot : msvcrt: Sign-compare warnings fix.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 4c3d27dfeedf1d10ded225e772596fc32d8419dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c3d27dfeedf1d10ded225e77… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Oct 21 21:44:27 2008 +0100 msvcrt: Sign-compare warnings fix. --- dlls/msvcrt/console.c | 2 +- dlls/msvcrt/except.c | 3 ++- dlls/msvcrt/file.c | 8 +++++--- dlls/msvcrt/undname.c | 2 +- dlls/msvcrt/wcs.c | 4 ++-- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index 21bcf16..267e0e1 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -121,7 +121,7 @@ int CDECL _getch(void) do { if (ReadConsoleInputA(MSVCRT_console_in, &ir, 1, &count)) { - int i; + unsigned int i; /* Only interested in ASCII chars */ if (ir.EventType == KEY_EVENT && ir.Event.KeyEvent.bKeyDown) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 296c656..adcd18c 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -478,7 +478,8 @@ static LONG WINAPI msvcrt_exception_filter(struct _EXCEPTION_POINTERS *except) { if (handler != MSVCRT_SIG_IGN) { - int i, float_signal = _FPE_INVALID; + unsigned int i; + int float_signal = _FPE_INVALID; sighandlers[MSVCRT_SIGFPE] = MSVCRT_SIG_DFL; for (i = 0; i < sizeof(float_exception_map) / diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c78e46c..7c0f74d 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1686,7 +1686,7 @@ static int read_i(int fd, void *buf, unsigned int count) { if (MSVCRT_fdesc[fd].wxflag & WX_TEXT) { - int i; + DWORD i; /* in text mode, a ctrl-z signals EOF */ for (i=0; i<num_read; i++) { @@ -2281,7 +2281,8 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) if (!(MSVCRT_fdesc[file->_file].wxflag & WX_TEXT)) { MSVCRT_wchar_t wc; - int i,j; + unsigned int i; + int j; char *chp, *wcp; wcp = (char *)&wc; for(i=0; i<sizeof(wc); i++) @@ -2324,7 +2325,8 @@ MSVCRT_wint_t CDECL MSVCRT_fgetwc(MSVCRT_FILE* file) int CDECL MSVCRT__getw(MSVCRT_FILE* file) { char *ch; - int i, j, k; + int i, k; + unsigned int j; ch = (char *)&i; for (j=0; j<sizeof(int); j++) { k = MSVCRT_fgetc(file); diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c index 1d9fae7..317d7d3 100644 --- a/dlls/msvcrt/undname.c +++ b/dlls/msvcrt/undname.c @@ -348,7 +348,7 @@ static char* get_args(struct parsed_symbol* sym, struct array* pmt_ref, BOOL z_t struct datatype_t ct; struct array arg_collect; char* args_str = NULL; - int i; + unsigned int i; str_array_init(&arg_collect); diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 7eab20b..65b8c2e 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1034,7 +1034,7 @@ INT CDECL MSVCRT_iswxdigit( MSVCRT_wchar_t wc ) */ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, const MSVCRT_wchar_t *wcSrc) { - INT size = 0; + MSVCRT_size_t size = 0; if(!wcDest || !numElement) return MSVCRT_EINVAL; @@ -1067,7 +1067,7 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con INT CDECL MSVCRT_wcsncpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, const MSVCRT_wchar_t *wcSrc, MSVCRT_size_t count ) { - INT size = 0; + MSVCRT_size_t size = 0; if (!wcDest || !numElement) return MSVCRT_EINVAL;

1 0

Paul Vriens : userenv/tests: Skip a few tests on NT4.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 86a0b2915a137debe3e2fe527fad1581b0ab806a URL: http://source.winehq.org/git/wine.git/?a=commit;h=86a0b2915a137debe3e2fe527… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 21 22:06:33 2008 +0200 userenv/tests: Skip a few tests on NT4. --- dlls/userenv/tests/userenv.c | 30 ++++++++++++++++++++++++++---- 1 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index af6a4e1..49491f7 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -162,8 +162,6 @@ static void test_create_env(void) int i, j; static const struct profile_item common_vars[] = { - { "ALLUSERSPROFILE", { 1, 1, 0, 0 } }, - { "CommonProgramFiles", { 1, 1, 1, 1 } }, { "ComSpec", { 1, 1, 0, 0 } }, { "COMPUTERNAME", { 1, 1, 1, 1 } }, { "NUMBER_OF_PROCESSORS", { 1, 1, 0, 0 } }, @@ -174,7 +172,11 @@ static void test_create_env(void) { "PROCESSOR_REVISION", { 1, 1, 0, 0 } }, { "SystemDrive", { 1, 1, 0, 0 } }, { "SystemRoot", { 1, 1, 0, 0 } }, - { "windir", { 1, 1, 0, 0 } }, + { "windir", { 1, 1, 0, 0 } } + }; + static const struct profile_item common_post_nt4_vars[] = { + { "ALLUSERSPROFILE", { 1, 1, 0, 0 } }, + { "CommonProgramFiles", { 1, 1, 1, 1 } }, { "ProgramFiles", { 1, 1, 0, 0 } } }; static const struct profile_item htok_vars[] = { @@ -216,7 +218,7 @@ static void test_create_env(void) r = CreateEnvironmentBlock((LPVOID) &env[3], htok, TRUE); expect(TRUE, r); - /* Test for common environment variables */ + /* Test for common environment variables (NT4 and higher) */ for (i = 0; i < sizeof(common_vars)/sizeof(common_vars[0]); i++) { for (j = 0; j < 4; j++) @@ -229,6 +231,26 @@ static void test_create_env(void) } } + /* Test for common environment variables (post NT4) */ + if (!GetEnvironmentVariableA("ALLUSERSPROFILE", NULL, 0)) + { + win_skip("Some environment variables are not present on NT4\n"); + } + else + { + for (i = 0; i < sizeof(common_post_nt4_vars)/sizeof(common_post_nt4_vars[0]); i++) + { + for (j = 0; j < 4; j++) + { + r = get_env(env[j], common_post_nt4_vars[i].name, &st); + if (common_post_nt4_vars[i].todo[j]) + todo_wine expect_env(TRUE, r, common_post_nt4_vars[i].name); + else + expect_env(TRUE, r, common_post_nt4_vars[i].name); + } + } + } + /* Test for environment variables with values that depends on htok */ for (i = 0; i < sizeof(htok_vars)/sizeof(htok_vars[0]); i++) {

1 0

Paul Vriens : userenv/tests: Rewrite the test to cope with multiple blocks of tests.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 8b01f4ae53651d61164ad10a4744983da5fa1717 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b01f4ae53651d61164ad10a4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Oct 21 21:54:01 2008 +0200 userenv/tests: Rewrite the test to cope with multiple blocks of tests. --- dlls/userenv/tests/userenv.c | 96 +++++++++++++----------------------------- 1 files changed, 29 insertions(+), 67 deletions(-) diff --git a/dlls/userenv/tests/userenv.c b/dlls/userenv/tests/userenv.c index df2774b..af6a4e1 100644 --- a/dlls/userenv/tests/userenv.c +++ b/dlls/userenv/tests/userenv.c @@ -157,7 +157,7 @@ static void test_create_env(void) { BOOL r; HANDLE htok; - WCHAR * env1, * env2, * env3, * env4; + WCHAR * env[4]; char * st; int i, j; @@ -175,15 +175,13 @@ static void test_create_env(void) { "SystemDrive", { 1, 1, 0, 0 } }, { "SystemRoot", { 1, 1, 0, 0 } }, { "windir", { 1, 1, 0, 0 } }, - { "ProgramFiles", { 1, 1, 0, 0 } }, - { 0, { 0, 0, 0, 0 } } + { "ProgramFiles", { 1, 1, 0, 0 } } }; static const struct profile_item htok_vars[] = { { "PATH", { 1, 1, 0, 0 } }, { "TEMP", { 1, 1, 0, 0 } }, { "TMP", { 1, 1, 0, 0 } }, - { "USERPROFILE", { 1, 1, 0, 0 } }, - { 0, { 0, 0, 0, 0 } } + { "USERPROFILE", { 1, 1, 0, 0 } } }; r = SetEnvironmentVariableA("WINE_XYZZY", "ZZYZX"); @@ -206,87 +204,51 @@ static void test_create_env(void) expect(FALSE, r); } - r = CreateEnvironmentBlock((LPVOID) &env1, NULL, FALSE); + r = CreateEnvironmentBlock((LPVOID) &env[0], NULL, FALSE); expect(TRUE, r); - r = CreateEnvironmentBlock((LPVOID) &env2, htok, FALSE); + r = CreateEnvironmentBlock((LPVOID) &env[1], htok, FALSE); expect(TRUE, r); - r = CreateEnvironmentBlock((LPVOID) &env3, NULL, TRUE); + r = CreateEnvironmentBlock((LPVOID) &env[2], NULL, TRUE); expect(TRUE, r); - r = CreateEnvironmentBlock((LPVOID) &env4, htok, TRUE); + r = CreateEnvironmentBlock((LPVOID) &env[3], htok, TRUE); expect(TRUE, r); /* Test for common environment variables */ - i = 0; - while (common_vars[i].name) + for (i = 0; i < sizeof(common_vars)/sizeof(common_vars[0]); i++) { - j = 0; - r = get_env(env1, common_vars[i].name, &st); - if (common_vars[i].todo[j]) - todo_wine expect_env(TRUE, r, common_vars[i].name); - else - expect_env(TRUE, r, common_vars[i].name); - j++; - r = get_env(env2, common_vars[i].name, &st); - if (common_vars[i].todo[j]) - todo_wine expect_env(TRUE, r, common_vars[i].name); - else - expect_env(TRUE, r, common_vars[i].name); - j++; - r = get_env(env3, common_vars[i].name, &st); - if (common_vars[i].todo[j]) - todo_wine expect_env(TRUE, r, common_vars[i].name); - else - expect_env(TRUE, r, common_vars[i].name); - j++; - r = get_env(env4, common_vars[i].name, &st); - if (common_vars[i].todo[j]) - todo_wine expect_env(TRUE, r, common_vars[i].name); - else - expect_env(TRUE, r, common_vars[i].name); - i++; + for (j = 0; j < 4; j++) + { + r = get_env(env[j], common_vars[i].name, &st); + if (common_vars[i].todo[j]) + todo_wine expect_env(TRUE, r, common_vars[i].name); + else + expect_env(TRUE, r, common_vars[i].name); + } } /* Test for environment variables with values that depends on htok */ - i = 0; - while (htok_vars[i].name) + for (i = 0; i < sizeof(htok_vars)/sizeof(htok_vars[0]); i++) { - j = 0; - r = get_env(env1, htok_vars[i].name, &st); - if (htok_vars[i].todo[j]) - todo_wine expect_env(TRUE, r, htok_vars[i].name); - else - expect_env(TRUE, r, htok_vars[i].name); - j++; - r = get_env(env2, htok_vars[i].name, &st); - if (htok_vars[i].todo[j]) - todo_wine expect_env(TRUE, r, htok_vars[i].name); - else - expect_env(TRUE, r, htok_vars[i].name); - j++; - r = get_env(env3, htok_vars[i].name, &st); - if (htok_vars[i].todo[j]) - todo_wine expect_env(TRUE, r, htok_vars[i].name); - else - expect_env(TRUE, r, htok_vars[i].name); - j++; - r = get_env(env4, htok_vars[i].name, &st); - if (htok_vars[i].todo[j]) - todo_wine expect_env(TRUE, r, htok_vars[i].name); - else - expect_env(TRUE, r, htok_vars[i].name); - i++; + for (j = 0; j < 4; j++) + { + r = get_env(env[j], htok_vars[i].name, &st); + if (htok_vars[i].todo[j]) + todo_wine expect_env(TRUE, r, htok_vars[i].name); + else + expect_env(TRUE, r, htok_vars[i].name); + } } - r = get_env(env1, "WINE_XYZZY", &st); + r = get_env(env[0], "WINE_XYZZY", &st); expect(FALSE, r); - r = get_env(env2, "WINE_XYZZY", &st); + r = get_env(env[1], "WINE_XYZZY", &st); expect(FALSE, r); - r = get_env(env3, "WINE_XYZZY", &st); + r = get_env(env[2], "WINE_XYZZY", &st); expect(TRUE, r); - r = get_env(env4, "WINE_XYZZY", &st); + r = get_env(env[3], "WINE_XYZZY", &st); expect(TRUE, r); }

1 0

Maarten Lankhorst : setupapi: Implement installing catalog files.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: c19b967cd8561357ee7a519a937454e703a10bd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c19b967cd8561357ee7a519a9… Author: Maarten Lankhorst <maarten(a)codeweavers.com> Date: Tue Oct 14 22:31:15 2008 +0200 setupapi: Implement installing catalog files. --- dlls/setupapi/Makefile.in | 2 +- dlls/setupapi/misc.c | 32 +++++++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/Makefile.in b/dlls/setupapi/Makefile.in index 3145003..1f633a4 100644 --- a/dlls/setupapi/Makefile.in +++ b/dlls/setupapi/Makefile.in @@ -6,7 +6,7 @@ VPATH = @srcdir@ MODULE = setupapi.dll IMPORTLIB = setupapi IMPORTS = uuid user32 version advapi32 rpcrt4 kernel32 ntdll -DELAYIMPORTS = shell32 +DELAYIMPORTS = shell32 wintrust C_SRCS = \ devinst.c \ diff --git a/dlls/setupapi/misc.c b/dlls/setupapi/misc.c index 62abc85..7109be9 100644 --- a/dlls/setupapi/misc.c +++ b/dlls/setupapi/misc.c @@ -28,13 +28,14 @@ #include "winreg.h" #include "setupapi.h" #include "lzexpand.h" +#include "softpub.h" +#include "mscat.h" #include "wine/unicode.h" #include "wine/debug.h" #include "setupapi_private.h" - WINE_DEFAULT_DEBUG_CHANNEL(setupapi); /* arbitrary limit not related to what native actually uses */ @@ -1052,17 +1053,38 @@ BOOL WINAPI SetupCopyOEMInfW( PCWSTR source, PCWSTR location, sizeof(catalog_file)/sizeof(catalog_file[0]), NULL )) { WCHAR source_cat[MAX_PATH]; - strcpyW( source_cat, source ); + HCATADMIN handle; + HCATINFO cat; + GUID msguid = DRIVER_ACTION_VERIFY; + SetupCloseInfFile( hinf ); + + strcpyW( source_cat, source ); p = strrchrW( source_cat, '\\' ); if (p) p++; else p = source_cat; - strcpyW( p, catalog_file ); - FIXME("install catalog file %s\n", debugstr_w( source_cat )); + TRACE("installing catalog file %s\n", debugstr_w( source_cat )); + + if (!CryptCATAdminAcquireContext(&handle, &msguid, 0)) + { + ERR("Could not acquire security context\n"); + return FALSE; + } + + if (!(cat = CryptCATAdminAddCatalog(handle, source_cat, catalog_file, 0))) + { + ERR("Could not add catalog\n"); + CryptCATAdminReleaseContext(handle, 0); + return FALSE; + } + + CryptCATAdminReleaseCatalogContext(handle, cat, 0); + CryptCATAdminReleaseContext(handle, 0); } - SetupCloseInfFile( hinf ); + else + SetupCloseInfFile( hinf ); if (!(ret = CopyFileW( source, target, (style & SP_COPY_NOOVERWRITE) != 0 ))) return ret;

1 0

Hans Leidekker : cryptui: Honour hDestCertStore in CryptUIWizImport, be more verbose about its shortcomings.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: 8cbc6f951f6eee6c81545908fdc97360dc47b933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cbc6f951f6eee6c81545908f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 22 10:42:34 2008 +0200 cryptui: Honour hDestCertStore in CryptUIWizImport, be more verbose about its shortcomings. --- dlls/cryptui/main.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index 0aab87e..482bd14 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -156,17 +156,21 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT HeapFree(GetProcessHeap(), 0, buffer); return FALSE; } - /* FIXME: verify certificate and determine store name dynamically */ - if (!(store = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, Root))) + if (hDestCertStore) store = hDestCertStore; + else { - WARN("unable to open certificate store\n"); - CertFreeCertificateContext(cert); - HeapFree(GetProcessHeap(), 0, buffer); - return FALSE; + FIXME("certificate store should be determined dynamically, picking Root store\n"); + if (!(store = CertOpenStore(CERT_STORE_PROV_SYSTEM_W, 0, 0, CERT_SYSTEM_STORE_CURRENT_USER, Root))) + { + WARN("unable to open certificate store\n"); + CertFreeCertificateContext(cert); + HeapFree(GetProcessHeap(), 0, buffer); + return FALSE; + } } ret = CertAddCertificateContextToStore(store, cert, CERT_STORE_ADD_REPLACE_EXISTING, NULL); - CertCloseStore(store, 0); + if (!hDestCertStore) CertCloseStore(store, 0); CertFreeCertificateContext(cert); HeapFree(GetProcessHeap(), 0, buffer); return ret;

1 0

Dmitry Timoshkov : gdi32: Make EnumEnhMetaFile update the DC state before calling the callback.
by Alexandre Julliard Oct. 22, 2008

Oct. 22, 2008

Module: wine Branch: master Commit: d1fe894a7d55524af4184e99f4c38ecf51b5c5b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1fe894a7d55524af4184e99f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Oct 22 13:43:19 2008 +0900 gdi32: Make EnumEnhMetaFile update the DC state before calling the callback. This makes applications with custom callbacks work properly, and fixes 'make test' in a win9x mode. --- dlls/gdi32/enhmetafile.c | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index ef53910..e998c60 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -756,10 +756,6 @@ BOOL WINAPI PlayEnhMetaFileRecord( type = mr->iType; - /* In Win9x mode we update the xform if the record will produce output */ - if ( IS_WIN9X() && emr_produces_output(type) ) - EMF_Update_MF_Xform(hdc, info); - TRACE("record %s\n", get_emr_name(type)); switch(type) { @@ -2193,13 +2189,6 @@ BOOL WINAPI PlayEnhMetaFileRecord( TRACE("L:0,0 - 1000,1000 -> D:%d,%d - %d,%d\n", tmprc.left, tmprc.top, tmprc.right, tmprc.bottom); - if ( !IS_WIN9X() ) - { - /* WinNT - update the transform (win9x updates when the next graphics output - record is played). */ - EMF_Update_MF_Xform(hdc, info); - } - return TRUE; } @@ -2405,9 +2394,19 @@ BOOL WINAPI EnumEnhMetaFile( while(ret && offset < emh->nBytes) { emr = (ENHMETARECORD *)((char *)emh + offset); + + /* In Win9x mode we update the xform if the record will produce output */ + if (hdc && IS_WIN9X() && emr_produces_output(emr->iType)) + EMF_Update_MF_Xform(hdc, info); + TRACE("Calling EnumFunc with record %s, size %d\n", get_emr_name(emr->iType), emr->nSize); ret = (*callback)(hdc, ht, emr, emh->nHandles, (LPARAM)data); offset += emr->nSize; + + /* WinNT - update the transform (win9x updates when the next graphics + output record is played). */ + if (hdc && !IS_WIN9X()) + EMF_Update_MF_Xform(hdc, info); } if (hdc)

1 0