October 2013 - Wine-commits

Dmitry Timoshkov : kernel32/tests: Increase the timeout for completion of write to a COM-port.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 0db996e14c337bb05198cb95cac9c05927b536da URL: http://source.winehq.org/git/wine.git/?a=commit;h=0db996e14c337bb05198cb95c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 25 12:14:30 2013 +0900 kernel32/tests: Increase the timeout for completion of write to a COM-port. It's not enough for some hardware configurations. --- dlls/kernel32/tests/comm.c | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 844c86d..33b10ac 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -855,8 +855,7 @@ static void test_waittxempty(void) SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait); ok(!res && GetLastError() == ERROR_IO_PENDING, "WaitCommEvent error %d\n", GetLastError()); - res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); -todo_wine + res = WaitForSingleObject(ovl_wait.hEvent, 1500); ok(res == WAIT_OBJECT_0, "WaitCommEvent failed with a timeout\n"); if (res == WAIT_OBJECT_0) { @@ -878,16 +877,13 @@ todo_wine res = FALSE; } after = GetTickCount(); -todo_wine ok(res, "WaitCommEvent error %d\n", GetLastError()); -todo_wine ok(evtmask & EV_TXEMPTY, "WaitCommEvent: expected EV_TXEMPTY, got %#x\n", evtmask); CloseHandle(ovl_wait.hEvent); timediff = after - before; trace("WaitCommEvent for EV_TXEMPTY took %d ms (timeout %d)\n", timediff, TIMEOUT); -todo_wine - ok(timediff < 900, "WaitCommEvent used %d ms for waiting\n", timediff); + ok(timediff < 1200, "WaitCommEvent used %d ms for waiting\n", timediff); res = WaitForSingleObject(ovl_write.hEvent, 0); ok(res == WAIT_OBJECT_0, "WriteFile failed with a timeout\n");

1 0

Dmitry Timoshkov : kernel32/tests: WaitCommEvent may sometimes return immediately on a busy system when write operation to a COM-port has already completed .
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 53e727ef95587d8d64c1c80669a10bea068ba651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e727ef95587d8d64c1c8066… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 25 12:14:37 2013 +0900 kernel32/tests: WaitCommEvent may sometimes return immediately on a busy system when write operation to a COM-port has already completed. --- dlls/kernel32/tests/comm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index 33b10ac..f780f75 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -939,7 +939,7 @@ static void test_waittxempty(void) evtmask = 0; SetLastError(0xdeadbeef); res = WaitCommEvent(hcom, &evtmask, &ovl_wait); - ok(!res && GetLastError() == ERROR_IO_PENDING, "%d: WaitCommEvent error %d\n", i, GetLastError()); + ok((!res && GetLastError() == ERROR_IO_PENDING) || res /* busy system */, "%d: WaitCommEvent error %d\n", i, GetLastError()); res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); if (i == 0)

1 0

Dmitry Timoshkov : server: Add support for pending write flag to the serial device.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 3b429e88ff44419b1479c433b9a094506583e8a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b429e88ff44419b1479c433b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Oct 25 12:14:42 2013 +0900 server: Add support for pending write flag to the serial device. --- dlls/kernel32/tests/comm.c | 1 - dlls/ntdll/file.c | 18 ++++++++++++++++++ dlls/ntdll/serial.c | 21 +++++++++++++-------- include/wine/server_protocol.h | 7 +++++-- server/protocol.def | 3 +++ server/request.h | 4 +++- server/serial.c | 11 +++++++++++ server/trace.c | 2 ++ 8 files changed, 55 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b429e88ff44419b1479c…

1 0

André Hentschel : usp10/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: f309e012828430ff11a30d157b09adab2049f741 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f309e012828430ff11a30d157… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 00:29:43 2013 +0200 usp10/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/usp10/tests/Makefile.in | 1 - dlls/usp10/tests/usp10.c | 27 +++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/usp10/tests/Makefile.in b/dlls/usp10/tests/Makefile.in index b2a7451..954a4a8 100644 --- a/dlls/usp10/tests/Makefile.in +++ b/dlls/usp10/tests/Makefile.in @@ -1,6 +1,5 @@ TESTDLL = usp10.dll IMPORTS = usp10 user32 gdi32 -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ usp10.c diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index 354bc23..22a4ab2 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -825,10 +825,9 @@ typedef struct tagRangeP { LOGFONTA lf; } fontEnumParam; -static int CALLBACK enumFontProc( const LOGFONT *lpelfe, const TEXTMETRIC *lpntme, - DWORD FontType, LPARAM lParam) +static int CALLBACK enumFontProc( const LOGFONTA *lpelfe, const TEXTMETRICA *lpntme, DWORD FontType, LPARAM lParam ) { - NEWTEXTMETRICEX *ntme = (NEWTEXTMETRICEX*)lpntme; + NEWTEXTMETRICEXA *ntme = (NEWTEXTMETRICEXA*)lpntme; fontEnumParam *rp = (fontEnumParam*) lParam; int idx = 0; DWORD i; @@ -850,7 +849,7 @@ static int CALLBACK enumFontProc( const LOGFONT *lpelfe, const TEXTMETRIC *lpntm if (ntme->ntmFontSig.fsUsb[idx] & mask) { - memcpy(&(rp->lf),lpelfe,sizeof(LOGFONT)); + memcpy(&(rp->lf),lpelfe,sizeof(LOGFONTA)); return 0; } return 1; @@ -862,7 +861,7 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co fontEnumParam lParam; lParam.range = range; - memset(&lParam.lf,0,sizeof(LOGFONT)); + memset(&lParam.lf,0,sizeof(LOGFONTA)); *hfont = NULL; if (recommended) @@ -881,7 +880,7 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co if (!*hfont) { - memset(&lParam.lf,0,sizeof(LOGFONT)); + memset(&lParam.lf,0,sizeof(LOGFONTA)); lParam.lf.lfCharSet = DEFAULT_CHARSET; if (!EnumFontFamiliesExA(hdc, &lParam.lf, enumFontProc, (LPARAM)&lParam, 0) && lParam.lf.lfFaceName[0]) @@ -1809,10 +1808,10 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) struct enum_font_data { int total; - ENUMLOGFONT elf[MAX_ENUM_FONTS]; + ENUMLOGFONTA elf[MAX_ENUM_FONTS]; }; -static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +static INT CALLBACK enum_bitmap_font_proc(const LOGFONTA *lf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) { struct enum_font_data *efnd = (struct enum_font_data *)lParam; @@ -1820,7 +1819,7 @@ static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *n if (efnd->total < MAX_ENUM_FONTS) { - efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + efnd->elf[efnd->total++] = *(ENUMLOGFONTA*)lf; } else trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); @@ -1828,7 +1827,7 @@ static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *n return 1; } -static INT CALLBACK enum_truetype_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +static INT CALLBACK enum_truetype_proc(const LOGFONTA *lf, const TEXTMETRICA *ntm, DWORD type, LPARAM lParam) { struct enum_font_data *efnd = (struct enum_font_data *)lParam; @@ -1836,7 +1835,7 @@ static INT CALLBACK enum_truetype_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, if (efnd->total < MAX_ENUM_FONTS) { - efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + efnd->elf[efnd->total++] = *(ENUMLOGFONTA*)lf; } else trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); @@ -1850,7 +1849,7 @@ static void test_ScriptGetFontProperties(HDC hdc) SCRIPT_CACHE psc,old_psc; SCRIPT_FONTPROPERTIES sfp; HFONT font, oldfont; - LOGFONT lf; + LOGFONTA lf; struct enum_font_data efnd; TEXTMETRICA tmA; WORD gi[3]; @@ -1934,7 +1933,7 @@ static void test_ScriptGetFontProperties(HDC hdc) for (i = 0; i < efnd.total; i++) { lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); - font = CreateFontIndirect(&lf); + font = CreateFontIndirectA(&lf); oldfont = SelectObject(hdc, font); sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); @@ -1975,7 +1974,7 @@ static void test_ScriptGetFontProperties(HDC hdc) for (i = 0; i < efnd.total; i++) { lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); - font = CreateFontIndirect(&lf); + font = CreateFontIndirectA(&lf); oldfont = SelectObject(hdc, font); sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES);

1 0

André Hentschel : psapi/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 3df00e29eee8df8859cbd8db353800248617bec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3df00e29eee8df8859cbd8db3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 00:30:04 2013 +0200 psapi/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/psapi/tests/Makefile.in | 1 - dlls/psapi/tests/psapi_main.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/psapi/tests/Makefile.in b/dlls/psapi/tests/Makefile.in index f64a5d0..849e3e5 100644 --- a/dlls/psapi/tests/Makefile.in +++ b/dlls/psapi/tests/Makefile.in @@ -1,5 +1,4 @@ TESTDLL = psapi.dll -EXTRADEFS = -U__WINESRC__ -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS C_SRCS = \ psapi_main.c diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index b91add6..ee7e8bd 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -81,7 +81,7 @@ static BOOL InitFunctionPtrs(HMODULE hpsapi) (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameA"); pGetProcessImageFileNameW = (void *)GetProcAddress(hpsapi, "GetProcessImageFileNameW"); - pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandle("ntdll.dll"), "NtQueryVirtualMemory"); + pNtQueryVirtualMemory = (void *)GetProcAddress(GetModuleHandleA("ntdll.dll"), "NtQueryVirtualMemory"); return TRUE; } @@ -105,7 +105,7 @@ static void test_EnumProcesses(void) static void test_EnumProcessModules(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); DWORD ret, cbNeeded = 0xdeadbeef; SetLastError(0xdeadbeef); @@ -134,8 +134,8 @@ static void test_EnumProcessModules(void) ret = pEnumProcessModules(hpQV, &hMod, sizeof(HMODULE), &cbNeeded); if(ret != 1) return; - ok(hMod == GetModuleHandle(NULL), - "hMod=%p GetModuleHandle(NULL)=%p\n", hMod, GetModuleHandle(NULL)); + ok(hMod == GetModuleHandleA(NULL), + "hMod=%p GetModuleHandleA(NULL)=%p\n", hMod, GetModuleHandleA(NULL)); ok(cbNeeded % sizeof(hMod) == 0, "not a multiple of sizeof(HMODULE) cbNeeded=%d\n", cbNeeded); /* Windows sometimes has a bunch of extra dlls, presumably brought in by * aclayers.dll. @@ -158,7 +158,7 @@ static void test_EnumProcessModules(void) static void test_GetModuleInformation(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); MODULEINFO info; DWORD ret; @@ -247,7 +247,7 @@ todo_wine static void test_GetMappedFileName(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); char szMapPath[MAX_PATH], szModPath[MAX_PATH], *szMapBaseName; DWORD ret; char *base; @@ -288,26 +288,26 @@ todo_wine } } - GetTempPath(MAX_PATH, temp_path); - GetTempFileName(temp_path, "map", 0, file_name); + GetTempPathA(MAX_PATH, temp_path); + GetTempFileNameA(temp_path, "map", 0, file_name); drive[0] = file_name[0]; drive[1] = ':'; drive[2] = 0; SetLastError(0xdeadbeef); - ret = QueryDosDevice(drive, device_name, sizeof(device_name)); - ok(ret, "QueryDosDevice error %d\n", GetLastError()); + ret = QueryDosDeviceA(drive, device_name, sizeof(device_name)); + ok(ret, "QueryDosDeviceA error %d\n", GetLastError()); trace("%s -> %s\n", drive, device_name); SetLastError(0xdeadbeef); - hfile = CreateFile(file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); - ok(hfile != INVALID_HANDLE_VALUE, "CreateFile(%s) error %d\n", file_name, GetLastError()); + hfile = CreateFileA(file_name, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "CreateFileA(%s) error %d\n", file_name, GetLastError()); SetFilePointer(hfile, 0x4000, NULL, FILE_BEGIN); SetEndOfFile(hfile); SetLastError(0xdeadbeef); - hmap = CreateFileMapping(hfile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL); - ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError()); + hmap = CreateFileMappingA(hfile, NULL, PAGE_READONLY | SEC_COMMIT, 0, 0, NULL); + ok(hmap != 0, "CreateFileMappingA error %d\n", GetLastError()); SetLastError(0xdeadbeef); base = MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 0); @@ -382,11 +382,11 @@ todo_wine UnmapViewOfFile(base); CloseHandle(hmap); CloseHandle(hfile); - DeleteFile(file_name); + DeleteFileA(file_name); SetLastError(0xdeadbeef); - hmap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READONLY | SEC_COMMIT, 0, 4096, NULL); - ok(hmap != 0, "CreateFileMapping error %d\n", GetLastError()); + hmap = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READONLY | SEC_COMMIT, 0, 4096, NULL); + ok(hmap != 0, "CreateFileMappingA error %d\n", GetLastError()); SetLastError(0xdeadbeef); base = MapViewOfFile(hmap, FILE_MAP_READ, 0, 0, 0); @@ -404,7 +404,7 @@ todo_wine static void test_GetProcessImageFileName(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); char szImgPath[MAX_PATH], szMapPath[MAX_PATH]; WCHAR szImgPathW[MAX_PATH]; DWORD ret, ret1; @@ -482,7 +482,7 @@ static void test_GetProcessImageFileName(void) static void test_GetModuleFileNameEx(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); char szModExPath[MAX_PATH+1], szModPath[MAX_PATH+1]; WCHAR buffer[MAX_PATH]; DWORD ret; @@ -541,7 +541,7 @@ static void test_GetModuleFileNameEx(void) static void test_GetModuleBaseName(void) { - HMODULE hMod = GetModuleHandle(NULL); + HMODULE hMod = GetModuleHandleA(NULL); char szModPath[MAX_PATH], szModBaseName[MAX_PATH]; DWORD ret;

1 0

André Hentschel : winspool.drv/tests: Fix tests compilation with __WINESRC__ defined.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 2a319e2cdd6263a87178220bd5aeacdcd8077297 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a319e2cdd6263a87178220bd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Oct 24 23:06:43 2013 +0200 winspool.drv/tests: Fix tests compilation with __WINESRC__ defined. --- dlls/winspool.drv/tests/Makefile.in | 1 - dlls/winspool.drv/tests/info.c | 174 +++++++++++++++++------------------ 2 files changed, 86 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2a319e2cdd6263a871782…

1 0

Francois Gouget : crypt32: Make add_cert_to_store() static.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: ca894127f82e9687cfbf586e55223b9b8832202b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca894127f82e9687cfbf586e5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Oct 25 11:45:09 2013 +0200 crypt32: Make add_cert_to_store() static. --- dlls/crypt32/cert.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index 1858a1b..bc0f26d 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -162,7 +162,7 @@ static const context_vtbl_t cert_vtbl = { Cert_clone }; -BOOL WINAPI add_cert_to_store(WINECRYPT_CERTSTORE *store, const CERT_CONTEXT *cert, +static BOOL WINAPI add_cert_to_store(WINECRYPT_CERTSTORE *store, const CERT_CONTEXT *cert, DWORD add_disposition, BOOL use_link, PCCERT_CONTEXT *ret_context) { const CERT_CONTEXT *existing = NULL;

1 0

Piotr Caban : msvcrt: Add __security_error_handler stub.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: e3592d041a42f4e8365825ab3dab5c2addbe1fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3592d041a42f4e8365825ab3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 25 14:12:43 2013 +0200 msvcrt: Add __security_error_handler stub. --- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcrt/except.c | 11 +++++++++++ dlls/msvcrt/msvcrt.spec | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 49b2dff..fbd4506 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -194,7 +194,7 @@ @ extern __pioinfo msvcrt.__pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs -@ stub __security_error_handler +@ cdecl __security_error_handler(long ptr) msvcrt.__security_error_handler @ cdecl __set_app_type(long) msvcrt.__set_app_type @ stub __set_buffer_overrun_handler @ extern __setlc_active msvcrt.__setlc_active diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index b0602b8..5f536c0 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -189,7 +189,7 @@ @ extern __pioinfo msvcrt.__pioinfo @ stub __pwctype_func @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs -@ stub __security_error_handler +@ cdecl __security_error_handler(long ptr) msvcrt.__security_error_handler @ cdecl __set_app_type(long) msvcrt.__set_app_type @ stub __set_buffer_overrun_handler @ extern __setlc_active msvcrt.__setlc_active diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index b77daa1..8cafba6 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -303,3 +303,14 @@ MSVCRT_security_error_handler CDECL _set_security_error_handler( security_error_handler = handler; return old; } + +/* __security_error_handler - not exported in native msvcrt */ +void CDECL __security_error_handler(int code, void *data) +{ + if(security_error_handler) + security_error_handler(code, data); + else + FIXME("(%d, %p) stub\n", code, data); + + MSVCRT__exit(3); +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 43daf0f..5e57aae 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1528,6 +1528,7 @@ @ cdecl _set_invalid_parameter_handler(ptr) @ cdecl _set_purecall_handler(ptr) @ cdecl _set_security_error_handler(ptr) +@ cdecl __security_error_handler(long ptr) @ cdecl -arch=i386 _statusfp2(ptr ptr) @ cdecl _wdupenv_s(ptr ptr wstr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output

1 0

Stefan Dösinger : d3d8/tests: Port z_range_test to d3d8.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: 9db01c16acd99f629b7248d95ffc37e0c9cf3e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db01c16acd99f629b7248d95… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Oct 25 00:48:01 2013 +0200 d3d8/tests: Port z_range_test to d3d8. --- dlls/d3d8/tests/visual.c | 234 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 200 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9db01c16acd99f629b724…

1 0

Nikolay Sivov : ole32: Add a helper to map ProgID to CLSID using registry.
by Alexandre Julliard 25 Oct '13

25 Oct '13

Module: wine Branch: master Commit: f96631e1108e6b23e0432e1c4fbac1a151341bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f96631e1108e6b23e0432e1c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 24 22:12:56 2013 +0400 ole32: Add a helper to map ProgID to CLSID using registry. --- dlls/ole32/compobj.c | 61 +++++++++++++++++++++++--------------------- dlls/ole32/tests/compobj.c | 9 ++++++ 2 files changed, 41 insertions(+), 29 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b8954fb..4d791f4 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2066,6 +2066,36 @@ static HRESULT __CLSIDFromString(LPCWSTR s, LPCLSID id) /*****************************************************************************/ +static HRESULT clsid_from_string_reg(LPCOLESTR progid, CLSID *clsid) +{ + static const WCHAR clsidW[] = { '\\','C','L','S','I','D',0 }; + WCHAR buf2[CHARS_IN_GUID]; + LONG buf2len = sizeof(buf2); + HKEY xhkey; + WCHAR *buf; + + memset(clsid, 0, sizeof(*clsid)); + buf = HeapAlloc( GetProcessHeap(),0,(strlenW(progid)+8) * sizeof(WCHAR) ); + strcpyW( buf, progid ); + strcatW( buf, clsidW ); + if (open_classes_key(HKEY_CLASSES_ROOT, buf, MAXIMUM_ALLOWED, &xhkey)) + { + HeapFree(GetProcessHeap(),0,buf); + WARN("couldn't open key for ProgID %s\n", debugstr_w(progid)); + return CO_E_CLASSSTRING; + } + HeapFree(GetProcessHeap(),0,buf); + + if (RegQueryValueW(xhkey,NULL,buf2,&buf2len)) + { + RegCloseKey(xhkey); + WARN("couldn't query clsid value for ProgID %s\n", debugstr_w(progid)); + return CO_E_CLASSSTRING; + } + RegCloseKey(xhkey); + return __CLSIDFromString(buf2,clsid); +} + HRESULT WINAPI CLSIDFromString(LPCOLESTR idstr, LPCLSID id ) { HRESULT ret; @@ -2076,7 +2106,7 @@ HRESULT WINAPI CLSIDFromString(LPCOLESTR idstr, LPCLSID id ) ret = __CLSIDFromString(idstr, id); if(ret != S_OK) { /* It appears a ProgID is also valid */ CLSID tmp_id; - ret = CLSIDFromProgID(idstr, &tmp_id); + ret = clsid_from_string_reg(idstr, &tmp_id); if(SUCCEEDED(ret)) *id = tmp_id; } @@ -2301,40 +2331,13 @@ HRESULT WINAPI ProgIDFromCLSID(REFCLSID clsid, LPOLESTR *ppszProgID) */ HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID clsid) { - static const WCHAR clsidW[] = { '\\','C','L','S','I','D',0 }; - WCHAR buf2[CHARS_IN_GUID]; - LONG buf2len = sizeof(buf2); - HKEY xhkey; - WCHAR *buf; - if (!progid || !clsid) { ERR("neither progid (%p) nor clsid (%p) are optional\n", progid, clsid); return E_INVALIDARG; } - /* initialise clsid in case of failure */ - memset(clsid, 0, sizeof(*clsid)); - - buf = HeapAlloc( GetProcessHeap(),0,(strlenW(progid)+8) * sizeof(WCHAR) ); - strcpyW( buf, progid ); - strcatW( buf, clsidW ); - if (open_classes_key(HKEY_CLASSES_ROOT, buf, MAXIMUM_ALLOWED, &xhkey)) - { - HeapFree(GetProcessHeap(),0,buf); - WARN("couldn't open key for ProgID %s\n", debugstr_w(progid)); - return CO_E_CLASSSTRING; - } - HeapFree(GetProcessHeap(),0,buf); - - if (RegQueryValueW(xhkey,NULL,buf2,&buf2len)) - { - RegCloseKey(xhkey); - WARN("couldn't query clsid value for ProgID %s\n", debugstr_w(progid)); - return CO_E_CLASSSTRING; - } - RegCloseKey(xhkey); - return __CLSIDFromString(buf2,clsid); + return clsid_from_string_reg(progid, clsid); } /****************************************************************************** diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 3bc98fc..81f099c 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -368,6 +368,15 @@ static void test_CLSIDFromProgID(void) { GUID clsid1; + memset(&clsid, 0xcc, sizeof(clsid)); + hr = CLSIDFromProgID(wszNonExistent, &clsid); + ok(hr == CO_E_CLASSSTRING, "got 0x%08x\n", hr); + ok(IsEqualCLSID(&clsid, &CLSID_NULL), "should have zero CLSID on failure\n"); + + /* CLSIDFromString() doesn't check activation context */ + hr = CLSIDFromString(progidW, &clsid); + ok(hr == CO_E_CLASSSTRING, "got 0x%08x\n", hr); + clsid = CLSID_NULL; hr = CLSIDFromProgID(progidW, &clsid); todo_wine

1 0