December 2008 - Wine-commits

Tag wine-1.1.10 : Alexandre Julliard : Release 1.1.10
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: refs/tags/wine-1.1.10 Tag: 30079d260841011f9cbe8acd312aeab9dfb63711 URL: http://source.winehq.org/git/wine.git/?a=tag;h=30079d260841011f9cbe8acd312a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 5 17:57:46 2008 +0100 Release 1.1.10

1 0

Ricardo Filipe : setupapi: Add stubs for SetupPromptForDiskA/W.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: 7e60ab10c1036f60e59bdf5b699d44ad8823a507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e60ab10c1036f60e59bdf5b6… Author: Ricardo Filipe <ricardo_barbano(a)hotmail.com> Date: Fri Dec 5 15:39:59 2008 +0000 setupapi: Add stubs for SetupPromptForDiskA/W. --- dlls/setupapi/setupapi.spec | 4 ++-- dlls/setupapi/stubs.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index ca37474..860a6a3 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -459,8 +459,8 @@ @ stdcall SetupOpenInfFileW(wstr wstr long ptr) @ stdcall SetupOpenLog(long) @ stdcall SetupOpenMasterInf() -@ stub SetupPromptForDiskA -@ stub SetupPromptForDiskW +@ stdcall SetupPromptForDiskA(ptr str str str str str long ptr long ptr) +@ stdcall SetupPromptForDiskW(ptr wstr wstr wstr wstr wstr long ptr long ptr) @ stdcall SetupPromptReboot(ptr ptr long) @ stub SetupQueryDrivesInDiskSpaceListA @ stub SetupQueryDrivesInDiskSpaceListW diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index a6f7a5b..33240ce 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -200,3 +200,31 @@ BOOL WINAPI SetupDiGetINFClassW(PCWSTR inf, LPGUID class_guid, PWSTR class_name, FIXME("%s %p %p %d %p\n", debugstr_w(inf), class_guid, class_name, size, required_size); return FALSE; } + +/*********************************************************************** + * SetupPromptForDiskA (SETUPAPI.@) + */ +UINT WINAPI SetupPromptForDiskA(HWND hwndParent, PCSTR DialogTitle, PCSTR DiskName, + PCSTR PathToSource, PCSTR FileSought, PCSTR TagFile, DWORD DiskPromptStyle, + PSTR PathBuffer, DWORD PathBufferSize, PDWORD PathRequiredSize) +{ + FIXME("%p %s %s %s %s %s %d %p %d %p: stub\n", hwndParent, debugstr_a(DialogTitle), + debugstr_a(DiskName), debugstr_a(PathToSource), debugstr_a(FileSought), + debugstr_a(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize, + PathRequiredSize); + return 0; +} + +/*********************************************************************** + * SetupPromptForDiskW (SETUPAPI.@) + */ +UINT WINAPI SetupPromptForDiskW(HWND hwndParent, PCWSTR DialogTitle, PCWSTR DiskName, + PCWSTR PathToSource, PCWSTR FileSought, PCWSTR TagFile, DWORD DiskPromptStyle, + PWSTR PathBuffer, DWORD PathBufferSize, PDWORD PathRequiredSize) +{ + FIXME("%p %s %s %s %s %s %d %p %d %p: stub\n", hwndParent, debugstr_w(DialogTitle), + debugstr_w(DiskName), debugstr_w(PathToSource), debugstr_w(FileSought), + debugstr_w(TagFile), DiskPromptStyle, PathBuffer, PathBufferSize, + PathRequiredSize); + return 0; +}

1 0

Paul Vriens : shell32/tests: Fix some new test failures on W2K.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: 252525da9a5e5c4e4e13e698c15cc966b950ca50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=252525da9a5e5c4e4e13e698c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Dec 5 16:52:39 2008 +0100 shell32/tests: Fix some new test failures on W2K. --- dlls/shell32/tests/shlfolder.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index f374070..6a06fb7 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -1563,29 +1563,35 @@ static void test_LocalizedNames(void) ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr); hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER, &strret); - ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr); + ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); if (SUCCEEDED(hr) && pStrRetToBufW) { hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); ok (SUCCEEDED(hr), "StrRetToBufW failed! hr = %08x\n", hr); - todo_wine ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); + todo_wine + ok (!lstrcmpiW(tempbufW, folderdisplayW) || + broken(!lstrcmpiW(tempbufW, foldernameW)), /* W2K */ + "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); } /* editing name is also read from the resource */ hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FOREDITING, &strret); - ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr); + ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); if (SUCCEEDED(hr) && pStrRetToBufW) { hr = pStrRetToBufW(&strret, newPIDL, tempbufW, sizeof(tempbufW)/sizeof(WCHAR)); ok (SUCCEEDED(hr), "StrRetToBufW failed! hr = %08x\n", hr); - todo_wine ok (!lstrcmpiW(tempbufW, folderdisplayW), "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); + todo_wine + ok (!lstrcmpiW(tempbufW, folderdisplayW) || + broken(!lstrcmpiW(tempbufW, foldernameW)), /* W2K */ + "GetDisplayNameOf returned %s\n", wine_dbgstr_w(tempbufW)); } /* parsing name is unchanged */ hr = IShellFolder_GetDisplayNameOf(testIShellFolder, newPIDL, SHGDN_INFOLDER|SHGDN_FORPARSING, &strret); - ok(hr == S_OK, "ParseDisplayName failed %08x\n", hr); + ok(hr == S_OK, "GetDisplayNameOf failed %08x\n", hr); if (SUCCEEDED(hr) && pStrRetToBufW) {

1 0

Huw Davies : opengl/tests: Skip tests if we can't find a pixel format.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: e86ff2a3128f4a0157ecfa10fee31d1416312c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e86ff2a3128f4a0157ecfa10f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Dec 5 14:19:25 2008 +0000 opengl/tests: Skip tests if we can't find a pixel format. --- dlls/opengl32/tests/opengl.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 35eb8ae..a3ac3af 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -555,7 +555,12 @@ START_TEST(opengl) hdc = GetDC(hwnd); iPixelFormat = ChoosePixelFormat(hdc, &pfd); - ok(iPixelFormat > 0, "No pixelformat found!\n"); /* This should never happen as ChoosePixelFormat always returns a closest match */ + if(iPixelFormat == 0) + { + /* This should never happen as ChoosePixelFormat always returns a closest match, but currently this fails in Wine if we don't have glX */ + win_skip("Unable to find pixel format.\n"); + goto cleanup; + } /* We shouldn't be able to create a context from a hdc which doesn't have a pixel format set */ hglrc = wglCreateContext(hdc); @@ -615,6 +620,8 @@ START_TEST(opengl) else trace("WGL_ARB_pbuffer not supported, skipping pbuffer test\n"); +cleanup: + ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); } }

1 0

Paul Vriens : user32/tests: Fix some typos.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: d0d7160c49fa8f1e16d7d3cbf7ea1dc56f62fdd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0d7160c49fa8f1e16d7d3cbf… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Dec 5 17:15:58 2008 +0100 user32/tests: Fix some typos. --- dlls/user32/tests/dde.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/dde.c b/dlls/user32/tests/dde.c index a3b73a5..dafb68c 100644 --- a/dlls/user32/tests/dde.c +++ b/dlls/user32/tests/dde.c @@ -1313,7 +1313,7 @@ static void test_dde_aw_transaction(void) dde_inst = 0; ret = DdeInitializeA(&dde_inst, client_dde_callback, APPCMD_CLIENTONLY, 0); - ok(ret == DMLERR_NO_ERROR, "DdeInitializeW failed with error %04x (%x)\n", + ok(ret == DMLERR_NO_ERROR, "DdeInitializeA failed with error %04x (%x)\n", ret, DdeGetLastError(dde_inst)); hsz_server = DdeCreateStringHandleW(dde_inst, TEST_DDE_SERVICE, CP_WINUNICODE); @@ -1701,7 +1701,7 @@ static void test_DdeCreateStringHandle(void) ret = DdeInitializeW(&dde_inst, client_ddeml_callback, APPCMD_CLIENTONLY, 0); if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { - skip("DdeInitialize is unimplemented\n"); + win_skip("DdeInitializeW is unimplemented\n"); return; }

1 0

Alexandre Julliard : Release 1.1.10.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: 7832378658339165d5f06972315a834e0bbddf16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7832378658339165d5f069723… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 5 17:57:45 2008 +0100 Release 1.1.10. --- ANNOUNCE | 1170 ++++++++++++++++++++++++++++++++++--------------------------- VERSION | 2 +- configure | 18 +- 3 files changed, 669 insertions(+), 521 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7832378658339165d5f06…

1 0

Paul Vriens : oleacc/tests: Fix the test failures on Win9x/WinMe and Vista/ W2K8.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: 212ce8b6d6b29a93780d6d0a7ba6ab3ca128affc URL: http://source.winehq.org/git/wine.git/?a=commit;h=212ce8b6d6b29a93780d6d0a7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Dec 5 12:54:26 2008 +0100 oleacc/tests: Fix the test failures on Win9x/WinMe and Vista/W2K8. --- dlls/oleacc/tests/main.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/oleacc/tests/main.c b/dlls/oleacc/tests/main.c index 269c2f9..db7ee9e 100644 --- a/dlls/oleacc/tests/main.c +++ b/dlls/oleacc/tests/main.c @@ -33,7 +33,9 @@ static void test_getroletext(void) buf[0] = '*'; ret = GetRoleTextA(-1, buf, 2); ok(ret == 0, "GetRoleTextA doesn't return zero on wrong role number, got %d\n", ret); - ok(buf[0] == '*', "GetRoleTextA modified buffer on wrong role number\n"); + ok(buf[0] == '*' || + broken(buf[0] == 0), /* Win98 and WinMe */ + "GetRoleTextA modified buffer on wrong role number\n"); buf[0] = '*'; ret = GetRoleTextA(-1, buf, 0); ok(ret == 0, "GetRoleTextA doesn't return zero on wrong role number, got %d\n", ret); @@ -44,7 +46,9 @@ static void test_getroletext(void) bufW[0] = '*'; ret = GetRoleTextW(-1, bufW, 2); ok(ret == 0, "GetRoleTextW doesn't return zero on wrong role number, got %d\n", ret); - ok(bufW[0] == '\0', "GetRoleTextW doesn't return NULL char on wrong role number\n"); + ok(bufW[0] == '\0' || + broken(bufW[0] == '*'), /* Win98 and WinMe */ + "GetRoleTextW doesn't return NULL char on wrong role number\n"); bufW[0] = '*'; ret = GetRoleTextW(-1, bufW, 0); ok(ret == 0, "GetRoleTextW doesn't return zero on wrong role number, got %d\n", ret); @@ -72,8 +76,11 @@ static void test_getroletext(void) ok(buf[0] == '\0', "GetRoleTextA returned not zero-length buffer\n"); buf[1] = '*'; ret = GetRoleTextA(ROLE_SYSTEM_TITLEBAR, buf, 2); - ok(ret == 1, "GetRoleTextA returned wrong length, got %d, expected 1\n", ret); - ok(buf[1] == '\0', "GetRoleTextA returned not zero-length buffer\n"); + ok(ret == 1 || + ret == 0, /* Vista and W2K8 */ + "GetRoleTextA returned wrong length, got %d, expected 0 or 1\n", ret); + if (ret == 1) + ok(buf[1] == '\0', "GetRoleTextA returned not zero-length buffer : (%c)\n", buf[1]); bufW[0] = '*'; ret = GetRoleTextW(ROLE_SYSTEM_TITLEBAR, bufW, 1);

1 0

Alexandre Julliard : libwine: Don' t export the selector functions for the Windows build.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: 44162aa21a5c00d9efe603bffdd2cb1f86ed2b13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44162aa21a5c00d9efe603bff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 5 13:25:23 2008 +0100 libwine: Don't export the selector functions for the Windows build. --- include/wine/library.h | 12 ++++++++++-- libs/wine/ldt.c | 5 +---- libs/wine/wine.def | 11 ----------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/include/wine/library.h b/include/wine/library.h index 2411ae1..84d0a60 100644 --- a/include/wine/library.h +++ b/include/wine/library.h @@ -93,7 +93,7 @@ extern void *wine_ldt_get_ptr( unsigned short sel, unsigned long offset ); extern unsigned short wine_ldt_alloc_entries( int count ); extern unsigned short wine_ldt_realloc_entries( unsigned short sel, int oldcount, int newcount ); extern void wine_ldt_free_entries( unsigned short sel, int count ); -#ifdef __i386__ +#if defined(__i386__) && !defined(__MINGW32__) && !defined(_MSC_VER) extern unsigned short wine_ldt_alloc_fs(void); extern void wine_ldt_init_fs( unsigned short sel, const LDT_ENTRY *entry ); extern void wine_ldt_free_fs( unsigned short sel ); @@ -178,7 +178,15 @@ static inline int wine_ldt_is_empty( const LDT_ENTRY *ent ) /* segment register access */ #ifdef __i386__ -# ifdef __GNUC__ +# ifdef __MINGW32__ +# define __DEFINE_GET_SEG(seg) \ + static inline unsigned short wine_get_##seg(void); \ + static inline unsigned short wine_get_##seg(void) \ + { unsigned short res; __asm__ __volatile__("movw %%" #seg ",%w0" : "=r"(res)); return res; } +# define __DEFINE_SET_SEG(seg) \ + static inline void wine_set_##seg(int val); \ + static inline void wine_set_##seg(int val) { __asm__("movw %w0,%%" #seg : : "r" (val)); } +# elif defined(__GNUC__) # define __DEFINE_GET_SEG(seg) \ extern inline unsigned short wine_get_##seg(void); \ extern inline unsigned short wine_get_##seg(void) \ diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index c46ff6f..80ceba8 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -385,7 +385,7 @@ void wine_ldt_free_entries( unsigned short sel, int count ) } -#ifdef __i386__ +#if defined(__i386__) && !defined(__MINGW32__) && !defined(_MSC_VER) static int global_fs_sel = -1; /* global selector for %fs shared among all threads */ @@ -477,8 +477,6 @@ void wine_ldt_free_fs( unsigned short sel ) /*********************************************************************** * selector access functions */ -# ifndef _MSC_VER -/* Nothing needs to be done for MS C, it will do with inline versions from the winnt.h */ __ASM_GLOBAL_FUNC( wine_get_cs, "movw %cs,%ax\n\tret" ) __ASM_GLOBAL_FUNC( wine_get_ds, "movw %ds,%ax\n\tret" ) __ASM_GLOBAL_FUNC( wine_get_es, "movw %es,%ax\n\tret" ) @@ -487,6 +485,5 @@ __ASM_GLOBAL_FUNC( wine_get_gs, "movw %gs,%ax\n\tret" ) __ASM_GLOBAL_FUNC( wine_get_ss, "movw %ss,%ax\n\tret" ) __ASM_GLOBAL_FUNC( wine_set_fs, "movl 4(%esp),%eax\n\tmovw %ax,%fs\n\tret" ) __ASM_GLOBAL_FUNC( wine_set_gs, "movl 4(%esp),%eax\n\tmovw %ax,%gs\n\tret" ) -# endif /* defined(_MSC_VER) */ #endif /* __i386__ */ diff --git a/libs/wine/wine.def b/libs/wine/wine.def index dc5f853..318db78 100644 --- a/libs/wine/wine.def +++ b/libs/wine/wine.def @@ -79,28 +79,19 @@ EXPORTS wine_get_build_dir wine_get_build_id wine_get_config_dir - wine_get_cs wine_get_data_dir - wine_get_ds - wine_get_es - wine_get_fs - wine_get_gs wine_get_server_dir wine_get_sortkey - wine_get_ss wine_get_user_name wine_get_version wine_init wine_init_argv0_path wine_is_dbcs_leadbyte wine_ldt_alloc_entries - wine_ldt_alloc_fs wine_ldt_copy wine_ldt_free_entries - wine_ldt_free_fs wine_ldt_get_entry wine_ldt_get_ptr - wine_ldt_init_fs wine_ldt_init_locking wine_ldt_is_system wine_ldt_realloc_entries @@ -111,8 +102,6 @@ EXPORTS wine_mmap_remove_reserved_area wine_pthread_get_functions wine_pthread_set_functions - wine_set_fs - wine_set_gs wine_switch_to_stack wine_utf8_mbstowcs wine_utf8_wcstombs

1 0

Juan Lang : cryptdlg: Implement FormatVerisignExtension.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: aebd13f768f4816b8fc29a4267529a1ad166bc13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aebd13f768f4816b8fc29a426… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 4 11:44:47 2008 -0800 cryptdlg: Implement FormatVerisignExtension. --- dlls/cryptdlg/Makefile.in | 4 +- dlls/cryptdlg/cryptdlg.rc | 25 ++ dlls/cryptdlg/cryptdlg.spec | 2 +- dlls/cryptdlg/cryptdlg_En.rc | 36 +++ dlls/cryptdlg/cryptres.h | 33 ++ dlls/cryptdlg/main.c | 660 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 758 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aebd13f768f4816b8fc29…

1 0

Austin English : dnsapi: Remove a useless check.
by Alexandre Julliard 05 Dec '08

05 Dec '08

Module: wine Branch: master Commit: 21bc015db3e9013d3604afdd26daf39614239bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=21bc015db3e9013d3604afdd2… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Dec 5 01:12:36 2008 -0600 dnsapi: Remove a useless check. --- dlls/dnsapi/ns_parse.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dnsapi/ns_parse.c b/dlls/dnsapi/ns_parse.c index cb9aa62..bfb83c2 100644 --- a/dlls/dnsapi/ns_parse.c +++ b/dlls/dnsapi/ns_parse.c @@ -136,7 +136,7 @@ dns_ns_parserr(ns_msg *handle, ns_sect section, int rrnum, ns_rr *rr) { int b; /* Make section right. */ - if (section < 0 || section >= ns_s_max) + if (section >= ns_s_max) RETERR(ENODEV); if (section != handle->_sect) setsection(handle, section);

1 0