May 2013 - Wine-Commits - list.winehq.org

Akihiro Sagawa : gdi32: Ignore the lfHeight value when it exceeds the limit .
by Alexandre Julliard May 8, 2013

May 8, 2013

Module: wine Branch: master Commit: 8f8363ede62c74aa3369fa4c1e5f9da7eafb18a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f8363ede62c74aa3369fa4c1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Wed May 8 21:11:20 2013 +0900 gdi32: Ignore the lfHeight value when it exceeds the limit. --- dlls/gdi32/freetype.c | 11 ++++++++- dlls/gdi32/tests/font.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c30a358..141238b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3983,6 +3983,7 @@ static LONG calc_ppem_for_height(FT_Face ft_face, LONG height) TT_HoriHeader *pHori; LONG ppem; + const LONG MAX_PPEM = (1 << 16) - 1; pOS2 = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_os2); pHori = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_hhea); @@ -4010,9 +4011,17 @@ static LONG calc_ppem_for_height(FT_Face ft_face, LONG height) else ppem = MulDiv(ft_face->units_per_EM, height, pOS2->usWinAscent + pOS2->usWinDescent); + if(ppem > MAX_PPEM) { + WARN("Ignoring too large height %d, ppem %d\n", height, ppem); + ppem = 1; + } } - else + else if(height >= -MAX_PPEM) ppem = -height; + else { + WARN("Ignoring too large height %d\n", height); + ppem = 1; + } return ppem; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index bc4e614..876b312 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5028,6 +5028,64 @@ static void test_stock_fonts(void) } } +static void test_max_height(void) +{ + HDC hdc; + LOGFONT lf; + HFONT hfont, hfont_old; + TEXTMETRICA tm1, tm; + BOOL r; + LONG invalid_height[] = { -65536, -123456, 123456 }; + size_t i; + + memset(&tm1, 0, sizeof(tm1)); + memset(&lf, 0, sizeof(lf)); + strcpy(lf.lfFaceName, "Tahoma"); + lf.lfHeight = -1; + + hdc = GetDC(NULL); + + /* get 1 ppem value */ + hfont = CreateFontIndirect(&lf); + hfont_old = SelectObject(hdc, hfont); + r = GetTextMetrics(hdc, &tm1); + ok(r, "GetTextMetrics failed\n"); + ok(tm1.tmHeight > 0, "expected a positive value, got %d\n", tm1.tmHeight); + ok(tm1.tmAveCharWidth > 0, "expected a positive value, got %d\n", tm1.tmHeight); + DeleteObject(SelectObject(hdc, hfont_old)); + + /* test the largest value */ + lf.lfHeight = -((1 << 16) - 1); + hfont = CreateFontIndirect(&lf); + hfont_old = SelectObject(hdc, hfont); + memset(&tm, 0, sizeof(tm)); + r = GetTextMetrics(hdc, &tm); + ok(r, "GetTextMetrics failed\n"); + ok(tm.tmHeight > tm1.tmHeight, + "expected greater than 1 ppem value (%d), got %d\n", tm1.tmHeight, tm.tmHeight); + ok(tm.tmAveCharWidth > tm1.tmAveCharWidth, + "expected greater than 1 ppem value (%d), got %d\n", tm1.tmAveCharWidth, tm.tmAveCharWidth); + DeleteObject(SelectObject(hdc, hfont_old)); + + /* test an invalid value */ + for (i = 0; i < sizeof(invalid_height)/sizeof(invalid_height[0]); i++) { + lf.lfHeight = invalid_height[i]; + hfont = CreateFontIndirect(&lf); + hfont_old = SelectObject(hdc, hfont); + memset(&tm, 0, sizeof(tm)); + r = GetTextMetrics(hdc, &tm); + ok(r, "GetTextMetrics failed\n"); + ok(tm.tmHeight == tm1.tmHeight, + "expected 1 ppem value (%d), got %d\n", tm1.tmHeight, tm.tmHeight); + ok(tm.tmAveCharWidth == tm1.tmAveCharWidth, + "expected 1 ppem value (%d), got %d\n", tm1.tmAveCharWidth, tm.tmAveCharWidth); + DeleteObject(SelectObject(hdc, hfont_old)); + } + + ReleaseDC(NULL, hdc); + return; +} + START_TEST(font) { init(); @@ -5084,6 +5142,7 @@ START_TEST(font) test_fullname(); test_fullname2(); test_east_asian_font_selection(); + test_max_height(); /* These tests should be last test until RemoveFontResource * is properly implemented.

1 0

Jacek Caban : d3d11.idl: Added some missing declarations and C++ helper classes.
by Alexandre Julliard May 8, 2013

May 8, 2013

Module: wine Branch: master Commit: 87c028449f8a09a6951c4c07dff1c92895207c2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=87c028449f8a09a6951c4c07d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 8 13:05:36 2013 +0200 d3d11.idl: Added some missing declarations and C++ helper classes. --- include/d3d11.idl | 215 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 215 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87c028449f8a09a6951c4…

1 0

Dmitry Timoshkov : comdlg32: Add a test for nCopies/ dmCopies returned by PrintDlg.
by Alexandre Julliard May 8, 2013

May 8, 2013

Module: wine Branch: master Commit: afb8e0296fba277127848750ee4fbbdffc7ef69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=afb8e0296fba277127848750e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 8 19:49:50 2013 +0900 comdlg32: Add a test for nCopies/dmCopies returned by PrintDlg. --- dlls/comdlg32/tests/printdlg.c | 60 +++++++++++++++++++++++++++++++++++++-- 1 files changed, 56 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index d004598..7acbdb0 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -2,6 +2,7 @@ * Unit test suite for comdlg32 API functions: printer dialogs * * Copyright 2006-2007 Detlef Riekenberg + * Copyright 2013 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -123,9 +124,19 @@ static void test_PageSetupDlgA(void) /* ########################### */ +static UINT_PTR CALLBACK print_hook_proc(HWND hdlg, UINT msg, WPARAM wp, LPARAM lp) +{ + if (msg == WM_INITDIALOG) + { + SetDlgItemInt(hdlg, edt3, 1234, FALSE); + PostMessage(hdlg, WM_COMMAND, IDOK, FALSE); + } + return 0; +} + static void test_PrintDlgA(void) { - DWORD res; + DWORD res, n_copies = 0; LPPRINTDLGA pDlg; DEVNAMES *pDevNames; LPCSTR driver; @@ -133,7 +144,7 @@ static void test_PrintDlgA(void) LPCSTR port; CHAR buffer[MAX_PATH]; LPSTR ptr; - + DEVMODE *dm; pDlg = HeapAlloc(GetProcessHeap(), 0, (sizeof(PRINTDLGA)) * 2); if (!pDlg) return; @@ -216,14 +227,55 @@ static void test_PrintDlgA(void) if (ptr) ptr[0] = '\0'; ok( lstrcmpiA(driver, buffer) == 0, "got driver '%s' (expected '%s')\n", driver, buffer); + + n_copies = DeviceCapabilities(device, port, DC_COPIES, NULL, NULL); + ok(n_copies > 0, "DeviceCapabilities(DC_COPIES) failed\n"); } GlobalUnlock(pDlg->hDevNames); - GlobalFree(pDlg->hDevMode); GlobalFree(pDlg->hDevNames); - HeapFree(GetProcessHeap(), 0, pDlg); + /* if device doesn't support printing of multiple copies then + * an attempt to set number of copies > 1 in print dialog would + * cause the PrintDlg under Windows display the MessageBox and + * the test will hang waiting for user response. + */ + if (n_copies > 1) + { + ZeroMemory(pDlg, sizeof(*pDlg)); + pDlg->lStructSize = sizeof(*pDlg); + pDlg->Flags = PD_ENABLEPRINTHOOK; + pDlg->lpfnPrintHook = print_hook_proc; + res = PrintDlg(pDlg); + ok(res, "PrintDlg error %#x\n", CommDlgExtendedError()); + /* Version of Microsoft XPS Document Writer driver shipped before Win7 + * reports that it can print multiple copies, but returns 1. + */ + ok(pDlg->nCopies == 1234 || broken(pDlg->nCopies == 1), "expected nCopies 1234, got %d\n", pDlg->nCopies); + ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); + dm = GlobalLock(pDlg->hDevMode); + ok(dm->dmCopies == 1, "expected dm->dmCopies 1, got %d\n", dm->dmCopies); + GlobalUnlock(pDlg->hDevMode); + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + + ZeroMemory(pDlg, sizeof(*pDlg)); + pDlg->lStructSize = sizeof(*pDlg); + pDlg->Flags = PD_ENABLEPRINTHOOK | PD_USEDEVMODECOPIES; + pDlg->lpfnPrintHook = print_hook_proc; + res = PrintDlg(pDlg); + ok(res, "PrintDlg error %#x\n", CommDlgExtendedError()); + ok(pDlg->nCopies == 1, "expected nCopies 1, got %d\n", pDlg->nCopies); + ok(pDlg->hDevMode != 0, "hDevMode should not be 0\n"); + dm = GlobalLock(pDlg->hDevMode); + ok(dm->dmCopies == 1234, "expected dm->dmCopies 1234, got %d\n", dm->dmCopies); + GlobalUnlock(pDlg->hDevMode); + GlobalFree(pDlg->hDevMode); + GlobalFree(pDlg->hDevNames); + } + + HeapFree(GetProcessHeap(), 0, pDlg); } /* ########################### */

1 0

Hans Leidekker : msi: Treat an empty install location as missing.
by Alexandre Julliard May 7, 2013

May 7, 2013

Module: wine Branch: master Commit: b98ef8f087c0c4a75af6dcf6cb214f5e976594ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=b98ef8f087c0c4a75af6dcf6c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue May 7 15:00:55 2013 +0200 msi: Treat an empty install location as missing. --- dlls/msi/action.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 827a0c8..cf03fa2 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2305,9 +2305,12 @@ static WCHAR *get_install_location( MSIPACKAGE *package ) WCHAR *path; if (!package->ProductCode) return NULL; - if (MSIREG_OpenInstallProps( package->ProductCode, package->Context, NULL, &hkey, FALSE )) - return NULL; - path = msi_reg_get_val_str( hkey, szInstallLocation ); + if (MSIREG_OpenInstallProps( package->ProductCode, package->Context, NULL, &hkey, FALSE )) return NULL; + if ((path = msi_reg_get_val_str( hkey, szInstallLocation )) && !path[0]) + { + msi_free( path ); + path = NULL; + } RegCloseKey( hkey ); return path; }

1 0

Alexandre Julliard : server: Use strerror instead of perror.
by Alexandre Julliard May 7, 2013

May 7, 2013

Module: wine Branch: master Commit: ea919d9de483223777948422e5c134bd73791ba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea919d9de483223777948422e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 7 12:19:22 2013 +0200 server: Use strerror instead of perror. --- server/registry.c | 8 +++--- server/request.c | 76 ++++++++++++++++++++-------------------------------- server/request.h | 5 --- server/thread.c | 2 +- 4 files changed, 34 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ea919d9de483223777948…

1 0

Dmitry Timoshkov : kernel32: Hold PEB lock during process exit.
by Alexandre Julliard May 7, 2013

May 7, 2013

Module: wine Branch: master Commit: 77f222505cdb392f2880932671051b345bf64078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77f222505cdb392f288093267… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 6 15:42:29 2013 +0900 kernel32: Hold PEB lock during process exit. --- dlls/kernel32/process.c | 2 ++ dlls/kernel32/tests/loader.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 7abb732..683385f 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2630,6 +2630,7 @@ __ASM_STDCALL_FUNC( ExitProcess, 4, /* Shrinker depend on this particular ExitPr void WINAPI process_ExitProcess( DWORD status ) { + RtlAcquirePebLock(); LdrShutdownProcess(); NtTerminateProcess(GetCurrentProcess(), status); exit(status); @@ -2639,6 +2640,7 @@ void WINAPI process_ExitProcess( DWORD status ) void WINAPI ExitProcess( DWORD status ) { + RtlAcquirePebLock(); LdrShutdownProcess(); NtTerminateProcess(GetCurrentProcess(), status); exit(status); diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index a45235f..17e6cd8 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1872,7 +1872,6 @@ static void test_ExitProcess(void) ret = CreateProcess(argv[0], cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess(%s) error %d\n", cmdline, GetLastError()); ret = WaitForSingleObject(pi.hProcess, 5000); -todo_wine ok(ret == WAIT_TIMEOUT, "child process should fail to terminate\n"); if (ret != WAIT_OBJECT_0) { @@ -1882,7 +1881,6 @@ todo_wine ret = WaitForSingleObject(pi.hProcess, 1000); ok(ret == WAIT_OBJECT_0, "child process failed to terminate\n"); GetExitCodeProcess(pi.hProcess, &ret); -todo_wine ok(ret == 199, "expected exit code 199, got %u\n", ret); if (*child_failures) {

1 0

Dmitry Timoshkov : server: Fail to set process affinity mask if the process is terminating.
by Alexandre Julliard May 7, 2013

May 7, 2013

Module: wine Branch: master Commit: bac0387d297ea547e69784d5372acf0586b5cc31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bac0387d297ea547e69784d53… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 6 15:40:34 2013 +0900 server: Fail to set process affinity mask if the process is terminating. --- dlls/kernel32/tests/loader.c | 3 +-- server/process.c | 6 ++++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index e4176b5..a45235f 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -1958,7 +1958,7 @@ todo_wine /* Checking process state without waiting for process termination * leads to different results due to a race condition. */ - ret = WaitForSingleObject(pi.hProcess, 100); + ret = WaitForSingleObject(pi.hProcess, 1000); ok(ret == WAIT_OBJECT_0, "WaitForSingleObject failed: %x\n", ret); memset(&pbi, 0, sizeof(pbi)); @@ -1967,7 +1967,6 @@ todo_wine ok(pbi.ExitStatus == 198, "expected 198, got %lu\n", pbi.ExitStatus); affinity = 1; ret = pNtSetInformationProcess(pi.hProcess, ProcessAffinityMask, &affinity, sizeof(affinity)); -todo_wine ok(ret == STATUS_PROCESS_IS_TERMINATING, "expected STATUS_PROCESS_IS_TERMINATING, got %#x\n", ret); SetLastError(0xdeadbeef); diff --git a/server/process.c b/server/process.c index 89c08dc..61d9d17 100644 --- a/server/process.c +++ b/server/process.c @@ -1122,6 +1122,12 @@ static void set_process_affinity( struct process *process, affinity_t affinity ) { struct thread *thread; + if (!process->running_threads) + { + set_error( STATUS_PROCESS_IS_TERMINATING ); + return; + } + process->affinity = affinity; LIST_FOR_EACH_ENTRY( thread, &process->thread_list, struct thread, proc_entry )

1 0

Ken Thomases : winemac: Implement SetCapture().
by Alexandre Julliard May 7, 2013

May 7, 2013

Module: wine Branch: master Commit: 1a697e15b9c156a9e7586a8620dd4e2141f780e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a697e15b9c156a9e7586a862… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 7 03:00:55 2013 -0500 winemac: Implement SetCapture(). --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 145 ++++++++++++++++++++++++------------- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/macdrv_cocoa.h | 1 + dlls/winemac.drv/mouse.c | 31 +++++++-- dlls/winemac.drv/winemac.drv.spec | 3 +- 6 files changed, 125 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1a697e15b9c156a9e7586…

1 0

Ken Thomases : winemac: Prefer absolute mouse moves unless cursor is pinned by clipping or desktop edges .
by Alexandre Julliard May 7, 2013

May 7, 2013

Module: wine Branch: master Commit: 3e3d982185c62020b7478f433486ade19378ed6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e3d982185c62020b7478f433… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue May 7 03:00:49 2013 -0500 winemac: Prefer absolute mouse moves unless cursor is pinned by clipping or desktop edges. This fixes an issue with sub-pixel-precise pointing devices on Lion and later. Wine's notion of the cursor position would get out of sync with the actual position because deltas don't convey the actual movement distance. --- dlls/winemac.drv/cocoa_app.h | 1 + dlls/winemac.drv/cocoa_app.m | 80 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 76 insertions(+), 5 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.h b/dlls/winemac.drv/cocoa_app.h index 5e4d181..3ce8a83 100644 --- a/dlls/winemac.drv/cocoa_app.h +++ b/dlls/winemac.drv/cocoa_app.h @@ -57,6 +57,7 @@ enum { CGFloat primaryScreenHeight; BOOL primaryScreenHeightValid; + NSMutableData* screenFrameCGRects; WineWindow* lastTargetWindow; BOOL forceNextMouseMoveAbsolute; diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index e8cca28..b4e15d0 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -170,6 +170,7 @@ int macdrv_err_on; - (void) dealloc { + [screenFrameCGRects release]; [applicationIcon release]; [warpRecords release]; [cursorTimer release]; @@ -377,10 +378,29 @@ int macdrv_err_on; if (!primaryScreenHeightValid) { NSArray* screens = [NSScreen screens]; - if ([screens count]) + NSUInteger count = [screens count]; + if (count) { + NSUInteger size; + CGRect* rect; + NSScreen* screen; + primaryScreenHeight = NSHeight([[screens objectAtIndex:0] frame]); primaryScreenHeightValid = TRUE; + + size = count * sizeof(CGRect); + if (!screenFrameCGRects) + screenFrameCGRects = [[NSMutableData alloc] initWithLength:size]; + else + [screenFrameCGRects setLength:size]; + + rect = [screenFrameCGRects mutableBytes]; + for (screen in screens) + { + CGRect temp = NSRectToCGRect([screen frame]); + temp.origin.y = primaryScreenHeight - CGRectGetMaxY(temp); + *rect++ = temp; + } } else return 1280; /* arbitrary value */ @@ -1157,9 +1177,9 @@ int macdrv_err_on; if ([targetWindow isKindOfClass:[WineWindow class]]) { + CGPoint point = CGEventGetLocation([anEvent CGEvent]); macdrv_event* event; - BOOL absolute = forceNextMouseMoveAbsolute || (targetWindow != lastTargetWindow); - forceNextMouseMoveAbsolute = FALSE; + BOOL absolute; // If we recently warped the cursor (other than in our cursor-clipping // event tap), discard mouse move events until we see an event which is @@ -1170,13 +1190,63 @@ int macdrv_err_on; return; lastSetCursorPositionTime = 0; + forceNextMouseMoveAbsolute = TRUE; + } + + if (forceNextMouseMoveAbsolute || targetWindow != lastTargetWindow) + { absolute = TRUE; + forceNextMouseMoveAbsolute = FALSE; + } + else + { + // Send absolute move events if the cursor is in the interior of + // its range. Only send relative moves if the cursor is pinned to + // the boundaries of where it can go. We compute the position + // that's one additional point in the direction of movement. If + // that is outside of the clipping rect or desktop region (the + // union of the screen frames), then we figure the cursor would + // have moved outside if it could but it was pinned. + CGPoint computedPoint = point; + CGFloat deltaX = [anEvent deltaX]; + CGFloat deltaY = [anEvent deltaY]; + + if (deltaX > 0.001) + computedPoint.x++; + else if (deltaX < -0.001) + computedPoint.x--; + + if (deltaY > 0.001) + computedPoint.y++; + else if (deltaY < -0.001) + computedPoint.y--; + + // Assume cursor is pinned for now + absolute = FALSE; + if (!clippingCursor || CGRectContainsPoint(cursorClipRect, computedPoint)) + { + const CGRect* rects; + NSUInteger count, i; + + // Caches screenFrameCGRects if necessary + [self primaryScreenHeight]; + + rects = [screenFrameCGRects bytes]; + count = [screenFrameCGRects length] / sizeof(rects[0]); + + for (i = 0; i < count; i++) + { + if (CGRectContainsPoint(rects[i], computedPoint)) + { + absolute = TRUE; + break; + } + } + } } if (absolute) { - CGPoint point = CGEventGetLocation([anEvent CGEvent]); - if (clippingCursor) [self clipCursorLocation:&point];

1 0

Dmitry Timoshkov : ole32: Add a semi-stub for CLSIDFromProgIDEx.
by Alexandre Julliard May 7, 2013

May 7, 2013

Module: wine Branch: master Commit: 79ef449e32d2f852e37b89dc6e24dfd024b04d1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=79ef449e32d2f852e37b89dc6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue May 7 11:51:36 2013 +0900 ole32: Add a semi-stub for CLSIDFromProgIDEx. --- dlls/ole32/compobj.c | 9 +++++++++ dlls/ole32/ole32.spec | 1 + 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 04d65c9..1857ac7 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2098,6 +2098,15 @@ HRESULT WINAPI CLSIDFromProgID(LPCOLESTR progid, LPCLSID clsid) return __CLSIDFromString(buf2,clsid); } +/****************************************************************************** + * CLSIDFromProgIDEx [OLE32.@] + */ +HRESULT WINAPI CLSIDFromProgIDEx(LPCOLESTR progid, LPCLSID clsid) +{ + FIXME("%s,%p: semi-stub\n", debugstr_w(progid), clsid); + + return CLSIDFromProgID(progid, clsid); +} /***************************************************************************** * CoGetPSClsid [OLE32.@] diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 9e3f80f..d71168e 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -4,6 +4,7 @@ @ stdcall CLIPFORMAT_UserSize(ptr long ptr) @ stdcall CLIPFORMAT_UserUnmarshal(ptr ptr ptr) @ stdcall CLSIDFromProgID(wstr ptr) +@ stdcall CLSIDFromProgIDEx(wstr ptr) @ stdcall CLSIDFromString(wstr ptr) @ stdcall CoAddRefServerProcess() @ stdcall CoAllowSetForegroundWindow(ptr ptr)

1 0