wine-commits August 2007

wine-commits@winehq.org

3 participants
1085 discussions

lostwages/ include/winehq.conf news/2007081001.xml
by Alexandre Julliard 10 Aug '07

10 Aug '07

ChangeSet ID: 31324 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: julliard(a)winehq.org 2007/08/10 11:28:35 Modified files: include : winehq.conf Added files: news : 2007081001.xml Log message: Release 0.9.43 Patch: http://cvs.winehq.org/patch.py?id=31324 Old revision New revision Changes Path 1.65 1.66 +1 -1 lostwages/include/winehq.conf Added 1.1 +0 -0 lostwages/news/2007081001.xml Index: lostwages/include/winehq.conf diff -u -p lostwages/include/winehq.conf:1.65 lostwages/include/winehq.conf:1.66 --- lostwages/include/winehq.conf:1.65 10 Aug 2007 16:28:35 -0000 +++ lostwages/include/winehq.conf 10 Aug 2007 16:28:35 -0000 @@ -29,7 +29,7 @@ news_xml_path: news wwn_xml_path: wwn # Snapshot Date -snapshot_date: 0.9.42 +snapshot_date: 0.9.43 # Current RH Packages Snapshot Date snapshot_date_rh: 0.9.2 Index: lostwages/news/2007081001.xml diff -u -p /dev/null lostwages/news/2007081001.xml:1.1 --- /dev/null 10 Aug 2007 16:28:35 -0000 +++ lostwages/news/2007081001.xml 10 Aug 2007 16:28:35 -0000 @@ -0,0 +1,25 @@ +<news> +<date>August 10, 2007</date> +<title>Wine 0.9.43 Released</title> +<body> +<p>Wine 0.9.43 was released today, with the following main changes:</p> + +<ul> +<li>Direct3D support on top of WGL instead of GLX for better portability.</li> +<li>Many DirectSound fixes.</li> +<li>Still more gdiplus functions.</li> +<li>Many crypt32 improvements.</li> +<li>Lots of bug fixes.</li> +</ul> + +<p> +Binary packages are in the process of being built and it may take a +few days for them to appear, but the source is +<a href="http://prdownloads.sourceforge.net/wine/wine-0.9.43.tar.bz2">available now</a>. +You can find out more about this release in the +<a href="?announce=0.9.43">announcement</a>. Check out our +<a href="/site/download">download page</a> for packages for your +distribution. +</p> +</body> +</news>

1 0

Tag wine-0.9.43 : Alexandre Julliard : Release 0.9.43
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: refs/tags/wine-0.9.43 Tag: c13e16bf9c1f03dc9e6276e492a36fe3f99da167 URL: http://source.winehq.org/git/wine.git/?a=tag;h=c13e16bf9c1f03dc9e6276e492a3… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 10 18:18:13 2007 +0200 Release 0.9.43

1 0

Alexandre Julliard : Release 0.9.43.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 409c93f6fd288942ba76e7486347b3e6a0ac4d44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=409c93f6fd288942ba76e7486… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 10 18:18:12 2007 +0200 Release 0.9.43. --- ANNOUNCE | 1086 +++++++++++++++++------------- ChangeLog | 2251 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ VERSION | 2 +- configure | 18 +- 4 files changed, 2871 insertions(+), 486 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=409c93f6fd288942ba76e…

1 0

Paul Vriens : snmpapi/tests: Be more verbose on missing functions.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 47c5c590f501415205d08ad0f1548c481da62ef5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c5c590f501415205d08ad0f… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Aug 10 13:47:07 2007 +0200 snmpapi/tests: Be more verbose on missing functions. --- dlls/snmpapi/tests/util.c | 24 +++++++++++++++--------- 1 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index d3504ff..a358a1a 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -23,7 +23,6 @@ #include <windef.h> #include <snmp.h> -static HMODULE hSnmpapi = 0; static INT (WINAPI *pSnmpUtilAsnAnyCpy)(AsnAny*, AsnAny*); static VOID (WINAPI *pSnmpUtilAsnAnyFree)(AsnAny*); static INT (WINAPI *pSnmpUtilOctetsCmp)(AsnOctetString*, AsnOctetString*); @@ -33,14 +32,21 @@ static INT (WINAPI *pSnmpUtilOctetsNCmp)(AsnOctetString*, AsnOctetString*, UINT static void InitFunctionPtrs(void) { - hSnmpapi = GetModuleHandle("snmpapi.dll"); - - pSnmpUtilAsnAnyCpy = (void*)GetProcAddress(hSnmpapi, "SnmpUtilAsnAnyCpy"); - pSnmpUtilAsnAnyFree = (void*)GetProcAddress(hSnmpapi, "SnmpUtilAsnAnyFree"); - pSnmpUtilOctetsCmp = (void*)GetProcAddress(hSnmpapi, "SnmpUtilOctetsCmp"); - pSnmpUtilOctetsCpy = (void*)GetProcAddress(hSnmpapi, "SnmpUtilOctetsCpy"); - pSnmpUtilOctetsFree = (void*)GetProcAddress(hSnmpapi, "SnmpUtilOctetsFree"); - pSnmpUtilOctetsNCmp = (void*)GetProcAddress(hSnmpapi, "SnmpUtilOctetsNCmp"); + HMODULE hSnmpapi = GetModuleHandle("snmpapi.dll"); + +#define SNMPAPI_GET_PROC(func) \ + p ## func = (void*)GetProcAddress(hSnmpapi, #func); \ + if(!p ## func) \ + trace("GetProcAddress(%s) failed\n", #func); + + SNMPAPI_GET_PROC(SnmpUtilAsnAnyCpy) + SNMPAPI_GET_PROC(SnmpUtilAsnAnyFree) + SNMPAPI_GET_PROC(SnmpUtilOctetsCmp) + SNMPAPI_GET_PROC(SnmpUtilOctetsCpy) + SNMPAPI_GET_PROC(SnmpUtilOctetsFree) + SNMPAPI_GET_PROC(SnmpUtilOctetsNCmp) + +#undef SNMPAPI_GET_PROC } static void test_SnmpUtilOidToA(void)

1 0

Paul Vriens : msi/tests: Run tests again on win98 and NT4.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 5f161252463ec1d78983845f5a48b7462a73ffdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f161252463ec1d78983845f5… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri Aug 10 15:04:57 2007 +0200 msi/tests: Run tests again on win98 and NT4. --- dlls/msi/tests/install.c | 67 +++++++++++++++++++------------ dlls/msi/tests/msi.c | 99 +++++++++++++++++++++++++--------------------- dlls/msi/tests/source.c | 75 +++++++++++++++++++++------------- 3 files changed, 141 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f161252463ec1d789838…

1 0

Roderick Colenbrander : wgl: Make sure onscreen pixelformats are on top in wglChoosePixelFormatARB.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: f879f69f9801be463ab3c160e991ae50c738fc58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f879f69f9801be463ab3c160e… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Fri Aug 10 15:35:02 2007 +0200 wgl: Make sure onscreen pixelformats are on top in wglChoosePixelFormatARB. --- dlls/winex11.drv/opengl.c | 44 ++++++++++++++++++++++++++------------------ 1 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 7ee99b1..ca379d0 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -984,7 +984,7 @@ static WineGLPixelFormat* ConvertPixelFormatWGLtoGLX(Display *display, int iPixe } /* Search our internal pixelformat list for the WGL format corresponding to the given fbconfig */ -static int ConvertPixelFormatGLXtoWGL(Display *display, int fmt_id) +static WineGLPixelFormat* ConvertPixelFormatGLXtoWGL(Display *display, int fmt_id) { int i; @@ -995,11 +995,11 @@ static int ConvertPixelFormatGLXtoWGL(Display *display, int fmt_id) for(i=0; i<WineGLPixelFormatListSize; i++) { if(WineGLPixelFormatList[i].fmt_id == fmt_id) { TRACE("Returning iPixelFormat %d for fmt_id 0x%x\n", WineGLPixelFormatList[i].iPixelFormat, fmt_id); - return WineGLPixelFormatList[i].iPixelFormat; + return &WineGLPixelFormatList[i]; } } TRACE("No compatible format found for fmt_id 0x%x\n", fmt_id); - return 0; + return NULL; } /** @@ -2513,8 +2513,9 @@ static GLboolean WINAPI X11DRV_wglChoosePixelFormatARB(HDC hdc, const int *piAtt int nCfgs = 0; UINT it; int fmt_id; - int fmt = 0; + WineGLPixelFormat *fmt; int pfmt_it = 0; + int run; TRACE("(%p, %p, %p, %d, %p, %p): hackish\n", hdc, piAttribIList, pfAttribFList, nMaxFormats, piFormats, nNumFormats); if (NULL != pfAttribFList) { @@ -2537,23 +2538,30 @@ static GLboolean WINAPI X11DRV_wglChoosePixelFormatARB(HDC hdc, const int *piAtt /* Loop through all matching formats and check if they are suitable. * Note that this function should at max return nMaxFormats different formats */ - for (it = 0; it < nCfgs; ++it) { - gl_test = pglXGetFBConfigAttrib(gdi_display, cfgs[it], GLX_FBCONFIG_ID, &fmt_id); - if (gl_test) { - ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); - continue; - } + for(run=0; run < 2; run++) + { + for (it = 0; it < nCfgs; ++it) { + gl_test = pglXGetFBConfigAttrib(gdi_display, cfgs[it], GLX_FBCONFIG_ID, &fmt_id); + if (gl_test) { + ERR("Failed to retrieve FBCONFIG_ID from GLXFBConfig, expect problems.\n"); + continue; + } - /* Search for the format in our list of compatible formats */ - fmt = ConvertPixelFormatGLXtoWGL(gdi_display, fmt_id); - if(!fmt) - continue; + /* Search for the format in our list of compatible formats */ + fmt = ConvertPixelFormatGLXtoWGL(gdi_display, fmt_id); + if(!fmt) + continue; - if(pfmt_it < nMaxFormats) { - piFormats[pfmt_it] = fmt; - TRACE("at %d/%d found FBCONFIG_ID 0x%x (%d)\n", it + 1, nCfgs, fmt_id, piFormats[pfmt_it]); + /* During the first run we only want onscreen formats and during the second only offscreen 'XOR' */ + if( ((run == 0) && fmt->offscreenOnly) || ((run == 1) && !fmt->offscreenOnly) ) + continue; + + if(pfmt_it < nMaxFormats) { + piFormats[pfmt_it] = fmt->iPixelFormat; + TRACE("at %d/%d found FBCONFIG_ID 0x%x (%d)\n", it + 1, nCfgs, fmt_id, piFormats[pfmt_it]); + } + pfmt_it++; } - pfmt_it++; } *nNumFormats = pfmt_it;

1 0

Mikołaj Zalewski : user32: CallWindowProc[AW] for mismatched built-in winprocs should take into account if the window is Unicode .
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 5e9ced90f70cee45f8b66ca578f5bb11b6999e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e9ced90f70cee45f8b66ca57… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Aug 8 21:35:28 2007 -0700 user32: CallWindowProc[AW] for mismatched built-in winprocs should take into account if the window is Unicode. --- dlls/user32/tests/class.c | 119 +++++++++++++++++++++++++++++++++++++++++++- dlls/user32/winproc.c | 36 +++++++++++--- 2 files changed, 144 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e9ced90f70cee45f8b66…

1 0

Detlef Riekenberg : winspool/tests: Add tests for EnumPrinterDrivers.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 5c04d1fe410b048c72a7eb5c0577b1faf38801de URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c04d1fe410b048c72a7eb5c0… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 10 10:47:36 2007 +0200 winspool/tests: Add tests for EnumPrinterDrivers. --- dlls/winspool.drv/info.c | 5 ++ dlls/winspool.drv/tests/info.c | 110 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 7ac322d..35c4a27 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -5105,6 +5105,11 @@ static BOOL WINSPOOL_EnumPrinterDrivers(LPWSTR pName, LPCWSTR pEnvironment, return FALSE; } + if ((pcbNeeded == NULL) || (pcReturned == NULL)) { + SetLastError(RPC_X_NULL_REF_POINTER); + return FALSE; + } + /* initialize return values */ if(pDriverInfo) memset( pDriverInfo, 0, cbBuf); diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 6586278..6006db3 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -1070,6 +1070,115 @@ static void test_EnumPorts(void) /* ########################### */ +static void test_EnumPrinterDrivers(void) +{ + DWORD res; + LPBYTE buffer; + DWORD cbBuf; + DWORD pcbNeeded; + DWORD pcReturned; + DWORD level; + + /* 1-3 for w95/w98/NT4; 1-3+6 for me; 1-6 for w2k/xp/2003; 1-6+8 for vista */ + for(level = 0; level < 10; level++) { + cbBuf = 0xdeadbeef; + pcReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = EnumPrinterDriversA(NULL, NULL, level, NULL, 0, &cbBuf, &pcReturned); + RETURN_ON_DEACTIVATED_SPOOLER(res) + + /* use only a short test, when we test with an invalid level */ + if(!level || (level == 7) || (level > 8)) { + + ok( (!res && (GetLastError() == ERROR_INVALID_LEVEL)) || + (res && (pcReturned == 0)), + "(%d) got %u with %u and 0x%x " + "(expected '0' with ERROR_INVALID_LEVEL or '!=0' and 0x0)\n", + level, res, GetLastError(), pcReturned); + continue; + } + + /* some level are not supported in all windows versions */ + if (!res && (GetLastError() == ERROR_INVALID_LEVEL)) { + skip("Level %d not supported\n", level); + continue; + } + + ok( ((!res) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) || + (res && (default_printer == NULL)), + "(%u) got %u with %u for %s (expected '0' with " + "ERROR_INSUFFICIENT_BUFFER or '!= 0' without a printer)\n", + level, res, GetLastError(), default_printer); + + if (!cbBuf) { + skip("no valid buffer size returned\n"); + continue; + } + + buffer = HeapAlloc(GetProcessHeap(), 0, cbBuf + 4); + if (buffer == NULL) continue; + + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + res = EnumPrinterDriversA(NULL, NULL, level, buffer, cbBuf, &pcbNeeded, &pcReturned); + ok(res, "(%u) got %u with %u (expected '!=0')\n", level, res, GetLastError()); + ok(pcbNeeded == cbBuf, "(%d) returned %d (expected %d)\n", level, pcbNeeded, cbBuf); + + /* validate the returned Data here */ + if (level > 1) { + LPDRIVER_INFO_2A di = (LPDRIVER_INFO_2A) buffer; + + ok( strrchr(di->pDriverPath, '\\') != NULL, + "(%u) got %s for %s (expected a full path)\n", + level, di->pDriverPath, di->pName); + + } + + SetLastError(0xdeadbeef); + pcReturned = 0xdeadbeef; + pcbNeeded = 0xdeadbeef; + res = EnumPrinterDriversA(NULL, NULL, level, buffer, cbBuf+1, &pcbNeeded, &pcReturned); + ok(res, "(%u) got %u with %u (expected '!=0')\n", level, res, GetLastError()); + ok(pcbNeeded == cbBuf, "(%u) returned %u (expected %u)\n", level, pcbNeeded, cbBuf); + + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + res = EnumPrinterDriversA(NULL, NULL, level, buffer, cbBuf-1, &pcbNeeded, &pcReturned); + ok( !res && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), + "(%u) got %u with %u (expected '0' with ERROR_INSUFFICIENT_BUFFER)\n", + level, res, GetLastError()); + ok(pcbNeeded == cbBuf, "(%u) returned %u (expected %u)\n", level, pcbNeeded, cbBuf); + +/* + Do not add the next test: + NT: ERROR_INVALID_USER_BUFFER + win9x: crash or 100% CPU + + res = EnumPrinterDriversA(NULL, NULL, level, NULL, cbBuf, &pcbNeeded, &pcReturned); +*/ + + SetLastError(0xdeadbeef); + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + res = EnumPrinterDriversA(NULL, NULL, level, buffer, cbBuf, NULL, &pcReturned); + ok( res || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)) , + "(%u) got %u with %u (expected '!=0' or '0' with " + "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); + + pcbNeeded = 0xdeadbeef; + pcReturned = 0xdeadbeef; + SetLastError(0xdeadbeef); + res = EnumPrinterDriversA(NULL, NULL, level, buffer, cbBuf, &pcbNeeded, NULL); + ok( res || (!res && (GetLastError() == RPC_X_NULL_REF_POINTER)) , + "(%u) got %u with %u (expected '!=0' or '0' with " + "RPC_X_NULL_REF_POINTER)\n", level, res, GetLastError()); + + HeapFree(GetProcessHeap(), 0, buffer); + } /* for(level ... */ +} + +/* ########################### */ + static void test_GetDefaultPrinter(void) { BOOL retval; @@ -2246,6 +2355,7 @@ START_TEST(info) if (default_printer) test_EnumForms(default_printer); test_EnumMonitors(); test_EnumPorts(); + test_EnumPrinterDrivers(); test_EnumPrinters(); test_GetDefaultPrinter(); test_GetPrinterDriverDirectory();

1 0

Detlef Riekenberg : comdlg32/tests: More tests for the member lStructSize.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: 84e4904ffdd9bd6732a180b8c0c02250fc829eeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=84e4904ffdd9bd6732a180b8c… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Fri Aug 10 07:12:04 2007 +0200 comdlg32/tests: More tests for the member lStructSize. --- dlls/comdlg32/tests/printdlg.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/comdlg32/tests/printdlg.c b/dlls/comdlg32/tests/printdlg.c index 27b0390..4577bb9 100644 --- a/dlls/comdlg32/tests/printdlg.c +++ b/dlls/comdlg32/tests/printdlg.c @@ -58,6 +58,15 @@ static void test_PageSetupDlgA(void) "returned %u with %u and 0x%x (expected '0' and " "CDERR_STRUCTSIZE)\n", res, GetLastError(), CommDlgExtendedError()); + ZeroMemory(pDlg, sizeof(PAGESETUPDLGA)); + pDlg->lStructSize = sizeof(PAGESETUPDLGA) +1; + pDlg->Flags = PSD_RETURNDEFAULT; + SetLastError(0xdeadbeef); + res = PageSetupDlgA(pDlg); + ok( !res && (CommDlgExtendedError() == CDERR_STRUCTSIZE), + "returned %u with %u and 0x%x (expected '0' and CDERR_STRUCTSIZE)\n", + res, GetLastError(), CommDlgExtendedError()); + ZeroMemory(pDlg, sizeof(PAGESETUPDLGA)); pDlg->lStructSize = sizeof(PAGESETUPDLGA); @@ -106,6 +115,15 @@ static void test_PrintDlgA(void) "returned %d with 0x%x and 0x%x (expected '0' and " "CDERR_STRUCTSIZE)\n", res, GetLastError(), CommDlgExtendedError()); + ZeroMemory(pDlg, sizeof(PRINTDLGA)); + pDlg->lStructSize = sizeof(PRINTDLGA) + 1; + pDlg->Flags = PD_RETURNDEFAULT; + SetLastError(0xdeadbeef); + res = PrintDlgA(pDlg); + ok( !res && (CommDlgExtendedError() == CDERR_STRUCTSIZE), + "returned %u with %u and 0x%x (expected '0' and " + "CDERR_STRUCTSIZE)\n", res, GetLastError(), CommDlgExtendedError()); + ZeroMemory(pDlg, sizeof(PRINTDLGA)); pDlg->lStructSize = sizeof(PRINTDLGA);

1 0

Evan Stade : gdiplus: Added GdipConvertToEmfPlus stub.
by Alexandre Julliard 10 Aug '07

10 Aug '07

Module: wine Branch: master Commit: f8b2b77f69bad9d45f3648519d3ed95ab72c9ee8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8b2b77f69bad9d45f3648519… Author: Evan Stade <estade(a)gmail.com> Date: Thu Aug 9 18:25:37 2007 -0700 gdiplus: Added GdipConvertToEmfPlus stub. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/image.c | 18 ++++++++++++++++++ include/gdiplusenums.h | 8 ++++++++ include/gdiplusflat.h | 2 ++ 4 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 3f2ceea..1f69314 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -66,7 +66,7 @@ @ stub GdipCombineRegionRectI @ stub GdipCombineRegionRegion @ stub GdipComment -@ stub GdipConvertToEmfPlus +@ stdcall GdipConvertToEmfPlus(ptr ptr ptr long ptr ptr) @ stub GdipConvertToEmfPlusToFile @ stub GdipConvertToEmfPlusToStream @ stub GdipCreateAdjustableArrowCap diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 633b225..d5780bf 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -255,6 +255,24 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR* filename, return stat; } +GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics* ref, + GpMetafile* metafile, BOOL* succ, EmfType emfType, + const WCHAR* description, GpMetafile** out_metafile) +{ + static int calls; + + if(!ref || !metafile || !out_metafile) + return InvalidParameter; + + *succ = FALSE; + *out_metafile = NULL; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + /* FIXME: this should create a bitmap in the given size with the attributes * (resolution etc.) of the graphics object */ GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT width, INT height, diff --git a/include/gdiplusenums.h b/include/gdiplusenums.h index a2fe1fb..7d71b6d 100644 --- a/include/gdiplusenums.h +++ b/include/gdiplusenums.h @@ -191,6 +191,13 @@ enum LinearGradientMode LinearGradientModeBackwardDiagonal }; +enum EmfType +{ + EmfTypeEmfOnly = MetafileTypeEmf, + EmfTypeEmfPlusOnly = MetafileTypeEmfPlusOnly, + EmfTypeEmfPlusDual = MetafileTypeEmfPlusDual +}; + #ifndef __cplusplus typedef enum Unit Unit; @@ -211,6 +218,7 @@ typedef enum ImageType ImageType; typedef enum WrapMode WrapMode; typedef enum MetafileType MetafileType; typedef enum LinearGradientMode LinearGradientMode; +typedef enum EmfType EmfType; #endif /* end of c typedefs */ diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 61d2e6d..6b45368 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -191,6 +191,8 @@ GpStatus WINGDIPAPI GdipSetCustomLineCapStrokeCaps(GpCustomLineCap*,GpLineCap, GpStatus WINGDIPAPI GdipBitmapGetPixel(GpBitmap*,INT,INT,ARGB*); GpStatus WINGDIPAPI GdipBitmapLockBits(GpBitmap*,GDIPCONST GpRect*,UINT, PixelFormat,BitmapData*); +GpStatus WINGDIPAPI GdipConvertToEmfPlus(const GpGraphics*,GpMetafile*,BOOL*, + EmfType,const WCHAR*,GpMetafile**); GpStatus WINGDIPAPI GdipCreateBitmapFromFile(GDIPCONST WCHAR*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromGraphics(INT,INT,GpGraphics*,GpBitmap**); GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT,INT,INT,PixelFormat,BYTE*,

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2007