March 2009 - Wine-commits - list.winehq.org

Aric Stewart : dinput: OS/X joystick: Check usage page to avoid odd non-button elements found on the 360 controller .
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 6bbec8e660911ab26198abb583b80e2d905efe23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bbec8e660911ab26198abb58… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 11 15:06:31 2009 -0500 dinput: OS/X joystick: Check usage page to avoid odd non-button elements found on the 360 controller. --- dlls/dinput/joystick_osx.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index c8a333f..b44896c 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -320,6 +320,13 @@ static void get_osx_device_elements(JoystickImpl *device, int axis_map[8]) { case kIOHIDElementTypeInput_Button: { + int usagePage = IOHIDElementGetUsagePage( tIOHIDElementRef ); + if (usagePage != kHIDPage_Button) + { + /* avoid strange elements found on the 360 controler */ + continue; + } + if (buttons < 128) { CFArrayInsertValueAtIndex(device->elementCFArrayRef, (axes+povs+buttons), tIOHIDElementRef);

1 0

Jacek Caban : mshtml: Don't use unicode constants for HTML IDs ( code clean up).
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 0700f281ce56f538a27338d521fc78a12ee82d82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0700f281ce56f538a27338d52… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 12 01:22:01 2009 +0100 mshtml: Don't use unicode constants for HTML IDs (code clean up). --- dlls/mshtml/tests/dom.c | 63 ++++++++++++++++++---------------------------- 1 files changed, 25 insertions(+), 38 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index f95b753..a272d95 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -66,8 +66,6 @@ static WCHAR wordW[] = {'w','o','r','d',0}; static const WCHAR text_javascriptW[] = {'t','e','x','t','/','j','a','v','a','s','c','r','i','p','t',0}; -static const WCHAR idW[] = {'i','d',0}; - typedef enum { ET_NONE, ET_HTML, @@ -627,7 +625,7 @@ static IHTMLDOMNode *_get_child_item(unsigned line, IHTMLDOMChildrenCollection * } #define test_elem_attr(e,n,v) _test_elem_attr(__LINE__,e,n,v) -static void _test_elem_attr(unsigned line, IHTMLElement *elem, LPCWSTR name, LPCWSTR exval) +static void _test_elem_attr(unsigned line, IHTMLElement *elem, const char *name, const char *exval) { VARIANT value; BSTR tmp; @@ -635,14 +633,14 @@ static void _test_elem_attr(unsigned line, IHTMLElement *elem, LPCWSTR name, LPC VariantInit(&value); - tmp = SysAllocString(name); + tmp = a2bstr(name); hres = IHTMLElement_getAttribute(elem, tmp, 0, &value); SysFreeString(tmp); ok_(__FILE__,line) (hres == S_OK, "getAttribute failed: %08x\n", hres); if(exval) { ok_(__FILE__,line) (V_VT(&value) == VT_BSTR, "vt=%d\n", V_VT(&value)); - ok_(__FILE__,line) (!lstrcmpW(exval, V_BSTR(&value)), "unexpected value %s\n", dbgstr_w(V_BSTR(&value))); + ok_(__FILE__,line) (!strcmp_wa(V_BSTR(&value), exval), "unexpected value %s\n", dbgstr_w(V_BSTR(&value))); }else { ok_(__FILE__,line) (V_VT(&value) == VT_NULL, "vt=%d\n", V_VT(&value)); } @@ -1955,7 +1953,7 @@ static void _test_style_set_csstext(unsigned line, IHTMLStyle *style, const char SysFreeString(tmp); } -static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, +static void test_elem_col_item(IHTMLElementCollection *col, const char *n, const elem_type_t *elem_types, long len) { IDispatch *disp; @@ -1965,7 +1963,7 @@ static void test_elem_col_item(IHTMLElementCollection *col, LPCWSTR n, V_VT(&index) = VT_EMPTY; V_VT(&name) = VT_BSTR; - V_BSTR(&name) = SysAllocString(n); + V_BSTR(&name) = a2bstr(n); hres = IHTMLElementCollection_item(col, name, index, &disp); ok(hres == S_OK, "item failed: %08x\n", hres); @@ -2008,7 +2006,7 @@ cleanup: SysFreeString(V_BSTR(&name)); } -static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, LPCWSTR id, BOOL expect_success) +static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, const char *id, BOOL expect_success) { IHTMLElementCollection *col; IHTMLElement *elem; @@ -2024,7 +2022,7 @@ static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, LPCWSTR id, BOOL expect V_VT(&index) = VT_EMPTY; V_VT(&name) = VT_BSTR; - V_BSTR(&name) = SysAllocString(id); + V_BSTR(&name) = a2bstr(id); hres = IHTMLElementCollection_item(col, name, index, &disp); IHTMLElementCollection_Release(col); @@ -2045,7 +2043,7 @@ static IHTMLElement *get_elem_by_id(IHTMLDocument2 *doc, LPCWSTR id, BOOL expect return elem; } -static IHTMLElement *get_doc_elem_by_id(IHTMLDocument2 *doc, LPCWSTR id) +static IHTMLElement *get_doc_elem_by_id(IHTMLDocument2 *doc, const char *id) { IHTMLDocument3 *doc3; IHTMLElement *elem; @@ -2055,10 +2053,10 @@ static IHTMLElement *get_doc_elem_by_id(IHTMLDocument2 *doc, LPCWSTR id) hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument3, (void**)&doc3); ok(hres == S_OK, "Could not get IHTMLDocument3 iface: %08x\n", hres); - tmp = SysAllocString(id); + tmp = a2bstr(id); hres = IHTMLDocument3_getElementById(doc3, tmp, &elem); SysFreeString(tmp); - ok(hres == S_OK, "getElementById(%s) failed: %08x\n", dbgstr_w(id), hres); + ok(hres == S_OK, "getElementById(%s) failed: %08x\n", id, hres); IHTMLDocument3_Release(doc3); @@ -4126,17 +4124,6 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLDocument3 *doc3; BSTR str; - static const WCHAR imgidW[] = {'i','m','g','i','d',0}; - static const WCHAR inW[] = {'i','n',0}; - static const WCHAR xW[] = {'x',0}; - static const WCHAR yW[] = {'y',0}; - static const WCHAR sW[] = {'s',0}; - static const WCHAR scW[] = {'s','c',0}; - static const WCHAR xxxW[] = {'x','x','x',0}; - static const WCHAR tblW[] = {'t','b','l',0}; - static const WCHAR row2W[] = {'r','o','w','2',0}; - static const WCHAR ifrW[] = {'i','f','r',0}; - static const elem_type_t all_types[] = { ET_HTML, ET_HEAD, @@ -4171,7 +4158,7 @@ static void test_elems(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_all(doc, &col); ok(hres == S_OK, "get_all failed: %08x\n", hres); test_elem_collection((IUnknown*)col, all_types, sizeof(all_types)/sizeof(all_types[0])); - test_elem_col_item(col, xW, item_types, sizeof(item_types)/sizeof(item_types[0])); + test_elem_col_item(col, "x", item_types, sizeof(item_types)/sizeof(item_types[0])); IHTMLElementCollection_Release(col); hres = IHTMLDocument2_get_images(doc, &collection); @@ -4216,16 +4203,16 @@ static void test_elems(IHTMLDocument2 *doc) test_elem_collection((IUnknown*)col, all_types+1, sizeof(all_types)/sizeof(all_types[0])-1); IHTMLElementCollection_Release(col); - get_elem_by_id(doc, xxxW, FALSE); - elem = get_doc_elem_by_id(doc, xxxW); + get_elem_by_id(doc, "xxx", FALSE); + elem = get_doc_elem_by_id(doc, "xxx"); ok(!elem, "elem != NULL\n"); - elem = get_doc_elem_by_id(doc, sW); + elem = get_doc_elem_by_id(doc, "s"); ok(elem != NULL, "elem == NULL\n"); if(elem) { test_elem_type((IUnknown*)elem, ET_SELECT); - test_elem_attr(elem, xxxW, NULL); - test_elem_attr(elem, idW, sW); + test_elem_attr(elem, "xxx", NULL); + test_elem_attr(elem, "id", "s"); test_elem_class((IUnknown*)elem, NULL); test_elem_set_class((IUnknown*)elem, "cl"); test_elem_set_class((IUnknown*)elem, NULL); @@ -4272,7 +4259,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - elem = get_elem_by_id(doc, sW, TRUE); + elem = get_elem_by_id(doc, "s", TRUE); if(elem) { IHTMLSelectElement *select; @@ -4305,7 +4292,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - elem = get_elem_by_id(doc, scW, TRUE); + elem = get_elem_by_id(doc, "sc", TRUE); if(elem) { IHTMLScriptElement *script; BSTR type; @@ -4337,7 +4324,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLScriptElement_Release(script); } - elem = get_elem_by_id(doc, inW, TRUE); + elem = get_elem_by_id(doc, "in", TRUE); if(elem) { IHTMLInputElement *input; @@ -4378,7 +4365,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - elem = get_elem_by_id(doc, imgidW, TRUE); + elem = get_elem_by_id(doc, "imgid", TRUE); if(elem) { test_img_src((IUnknown*)elem, ""); test_img_set_src((IUnknown*)elem, "about:blank"); @@ -4387,21 +4374,21 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElement_Release(elem); } - elem = get_doc_elem_by_id(doc, tblW); + elem = get_doc_elem_by_id(doc, "tbl"); ok(elem != NULL, "elem == NULL\n"); if(elem) { test_table_elem(elem); IHTMLElement_Release(elem); } - elem = get_doc_elem_by_id(doc, row2W); + elem = get_doc_elem_by_id(doc, "row2"); ok(elem != NULL, "elem == NULL\n"); if(elem) { test_tr_elem(elem); IHTMLElement_Release(elem); } - elem = get_doc_elem_by_id(doc, ifrW); + elem = get_doc_elem_by_id(doc, "ifr"); ok(elem != NULL, "elem == NULL\n"); if(elem) { test_iframe_elem(elem); @@ -4483,7 +4470,7 @@ static void test_elems(IHTMLDocument2 *doc) test_stylesheets(doc); test_create_option_elem(doc); - elem = get_doc_elem_by_id(doc, tblW); + elem = get_doc_elem_by_id(doc, "tbl"); ok(elem != NULL, "elem = NULL\n"); test_elem_set_innertext(elem, "inner text"); IHTMLElement_Release(elem); @@ -4528,7 +4515,7 @@ static void test_elems(IHTMLDocument2 *doc) IHTMLElementCollection_Release(col); } - elem = get_doc_elem_by_id(doc, yW); + elem = get_doc_elem_by_id(doc, "y"); test_elem_set_innerhtml((IUnknown*)elem, "inner html"); test_elem_innerhtml((IUnknown*)elem, "inner html"); test_elem_set_innerhtml((IUnknown*)elem, "");

1 0

Francois Gouget : winemenubuilder: Print an error message if we are unable to load an lnk file.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: dfd09c310cb02f544fe8f95deadc7d249ed3c67a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfd09c310cb02f544fe8f95de… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 11 17:18:17 2009 +0100 winemenubuilder: Print an error message if we are unable to load an lnk file. --- programs/winemenubuilder/winemenubuilder.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 69303c7..0c42b30 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1589,6 +1589,10 @@ static BOOL Process_Link( LPCWSTR linkname, BOOL bWait ) InvokeShellLinker( sl, fullname, FALSE ); } } + else + { + WINE_ERR("unable to load %s\n", wine_dbgstr_w(linkname)); + } IPersistFile_Release( pf ); IShellLinkW_Release( sl );

1 0

Aurimas Fischer : regedit: Add Lithuanian translation.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: ddb2dc1ca9f4dc457b1577690c97c0eae8c35886 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddb2dc1ca9f4dc457b1577690… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Wed Mar 11 15:21:49 2009 +0200 regedit: Add Lithuanian translation. --- programs/regedit/Lt.rc | 331 ++++++++++++++++++++++++++++++++++++++++++++++ programs/regedit/rsrc.rc | 1 + 2 files changed, 332 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ddb2dc1ca9f4dc457b157…

1 0

Aurimas Fischer : regedit: Add missing English resource.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: c95011dc5c670a1cadc018906016f957c79587f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c95011dc5c670a1cadc018906… Author: Aurimas Fischer <aurimas(a)gmail.com> Date: Wed Mar 11 19:11:54 2009 +0200 regedit: Add missing English resource. --- programs/regedit/En.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/regedit/En.rc b/programs/regedit/En.rc index 51bb5c3..5be99fc 100644 --- a/programs/regedit/En.rc +++ b/programs/regedit/En.rc @@ -360,6 +360,7 @@ BEGIN ID_EDIT_COPYKEYNAME "Copies the name of the selected key to the clipboard" ID_EDIT_FIND "Finds a text string in a key, value or data" ID_EDIT_FINDNEXT "Finds next occurrence of text specified in previous search" + ID_EDIT_EXPORT "Exports selected branch of the registry to a text file" END STRINGTABLE DISCARDABLE

1 0

Francois Gouget : winemenubuilder: Fix an off-by-one check that resulted in erroneous error messages.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 9b6d3676a00cdeab846e54d006df4e04b6170ca3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b6d3676a00cdeab846e54d00… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 11 17:16:41 2009 +0100 winemenubuilder: Fix an off-by-one check that resulted in erroneous error messages. --- programs/winemenubuilder/winemenubuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index f5f7ec0..69303c7 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -480,7 +480,7 @@ static BOOL extract_icon32(LPCWSTR szFileName, int nIndex, char *szXPMFileName) sEnumRes.nIndex = nIndex; if (!EnumResourceNamesW(hModule, (LPCWSTR)RT_GROUP_ICON, EnumResNameProc, (LONG_PTR)&sEnumRes) && - sEnumRes.nIndex != 0) + sEnumRes.nIndex != -1) { WINE_TRACE("EnumResourceNamesW failed, error %d\n", GetLastError()); }

1 0

Jeremy White : sane.ds: Add support for DG_IMAGE/DAT_IMAGELAYOUT/ GET and SET. Enables Acrobat to use custom scan sizes.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 33ea7d08019bb4c714d866d9df198467d1557e7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=33ea7d08019bb4c714d866d9d… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Mar 11 10:28:13 2009 -0500 sane.ds: Add support for DG_IMAGE/DAT_IMAGELAYOUT/GET and SET. Enables Acrobat to use custom scan sizes. --- dlls/sane.ds/ds_image.c | 98 ++++++++++++++++++++++++++++++++++++++++++--- dlls/twain_32/tests/dsm.c | 47 +++++++++++++++++++++ 2 files changed, 139 insertions(+), 6 deletions(-) diff --git a/dlls/sane.ds/ds_image.c b/dlls/sane.ds/ds_image.c index 63e0179..4777040 100644 --- a/dlls/sane.ds/ds_image.c +++ b/dlls/sane.ds/ds_image.c @@ -116,12 +116,49 @@ TW_UINT16 SANE_ImageInfoGet (pTW_IDENTITY pOrigin, } /* DG_IMAGE/DAT_IMAGELAYOUT/MSG_GET */ -TW_UINT16 SANE_ImageLayoutGet (pTW_IDENTITY pOrigin, +TW_UINT16 SANE_ImageLayoutGet (pTW_IDENTITY pOrigin, TW_MEMREF pData) { - FIXME ("stub!\n"); - +#ifndef SONAME_LIBSANE return TWRC_FAILURE; +#else + TW_IMAGELAYOUT *img = (TW_IMAGELAYOUT *) pData; + SANE_Fixed tlx_current; + SANE_Fixed tly_current; + SANE_Fixed brx_current; + SANE_Fixed bry_current; + SANE_Status status; + + TRACE("DG_IMAGE/DAT_IMAGELAYOUT/MSG_GET\n"); + + status = sane_option_probe_scan_area(activeDS.deviceHandle, "tl-x", &tlx_current, NULL, NULL, NULL, NULL); + if (status == SANE_STATUS_GOOD) + status = sane_option_probe_scan_area(activeDS.deviceHandle, "tl-y", &tly_current, NULL, NULL, NULL, NULL); + + if (status == SANE_STATUS_GOOD) + status = sane_option_probe_scan_area(activeDS.deviceHandle, "br-x", &brx_current, NULL, NULL, NULL, NULL); + + if (status == SANE_STATUS_GOOD) + status = sane_option_probe_scan_area(activeDS.deviceHandle, "br-y", &bry_current, NULL, NULL, NULL, NULL); + + if (status != SANE_STATUS_GOOD) + { + activeDS.twCC = sane_status_to_twcc(status); + return TWRC_FAILURE; + } + + convert_sane_res_to_twain(SANE_UNFIX(tlx_current), SANE_UNIT_MM, &img->Frame.Left, TWUN_INCHES); + convert_sane_res_to_twain(SANE_UNFIX(tly_current), SANE_UNIT_MM, &img->Frame.Top, TWUN_INCHES); + convert_sane_res_to_twain(SANE_UNFIX(brx_current), SANE_UNIT_MM, &img->Frame.Right, TWUN_INCHES); + convert_sane_res_to_twain(SANE_UNFIX(bry_current), SANE_UNIT_MM, &img->Frame.Bottom, TWUN_INCHES); + + img->DocumentNumber = 1; + img->PageNumber = 1; + img->FrameNumber = 1; + + activeDS.twCC = TWCC_SUCCESS; + return TWRC_SUCCESS; +#endif } /* DG_IMAGE/DAT_IMAGELAYOUT/MSG_GETDEFAULT */ @@ -142,13 +179,62 @@ TW_UINT16 SANE_ImageLayoutReset (pTW_IDENTITY pOrigin, return TWRC_FAILURE; } +#ifdef SONAME_LIBSANE +static TW_UINT16 set_one_imagecoord(const char *option_name, TW_FIX32 val, BOOL *changed) +{ + double d = val.Whole + ((double) val.Frac / 65536.0); + int set_status = 0; + SANE_Status status; + status = sane_option_set_fixed(activeDS.deviceHandle, option_name, + SANE_FIX((d * 254) / 10), &set_status); + if (status != SANE_STATUS_GOOD) + { + activeDS.twCC = sane_status_to_twcc(status); + return TWRC_FAILURE; + } + if (set_status & SANE_INFO_INEXACT) + *changed = TRUE; + return TWRC_SUCCESS; +} +#endif + /* DG_IMAGE/DAT_IMAGELAYOUT/MSG_SET */ -TW_UINT16 SANE_ImageLayoutSet (pTW_IDENTITY pOrigin, +TW_UINT16 SANE_ImageLayoutSet (pTW_IDENTITY pOrigin, TW_MEMREF pData) { - FIXME ("stub!\n"); - +#ifndef SONAME_LIBSANE return TWRC_FAILURE; +#else + TW_IMAGELAYOUT *img = (TW_IMAGELAYOUT *) pData; + BOOL changed = FALSE; + TW_UINT16 twrc; + + TRACE("DG_IMAGE/DAT_IMAGELAYOUT/MSG_SET\n"); + TRACE("Frame: [Left %x.%x|Top %x.%x|Right %x.%x|Bottom %x.%x]\n", + img->Frame.Left.Whole, img->Frame.Left.Frac, + img->Frame.Top.Whole, img->Frame.Top.Frac, + img->Frame.Right.Whole, img->Frame.Right.Frac, + img->Frame.Bottom.Whole, img->Frame.Bottom.Frac); + + twrc = set_one_imagecoord("tl-x", img->Frame.Left, &changed); + if (twrc != TWRC_SUCCESS) + return (twrc); + + twrc = set_one_imagecoord("tl-y", img->Frame.Top, &changed); + if (twrc != TWRC_SUCCESS) + return (twrc); + + twrc = set_one_imagecoord("br-x", img->Frame.Right, &changed); + if (twrc != TWRC_SUCCESS) + return (twrc); + + twrc = set_one_imagecoord("br-y", img->Frame.Bottom, &changed); + if (twrc != TWRC_SUCCESS) + return (twrc); + + activeDS.twCC = TWCC_SUCCESS; + return changed ? TWRC_CHECKSTATUS : TWRC_SUCCESS; +#endif } /* DG_IMAGE/DAT_IMAGEMEMXFER/MSG_GET */ diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index 4218f25..e46b0e0 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -583,6 +583,51 @@ static void test_supported_sizes(TW_IDENTITY *appid, TW_IDENTITY *source, TW_INT } } +static void test_imagelayout(TW_IDENTITY *appid, TW_IDENTITY *source) +{ + TW_UINT16 rc; + TW_STATUS status; + TW_IMAGELAYOUT layout; + + rc = pDSM_Entry(appid, source, DG_IMAGE, DAT_IMAGELAYOUT, MSG_GET, &layout); + get_condition_code(appid, source, &status); + ok(rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS, + "Error [rc %d|cc %d] doing MSG_GET for DG_IMAGE/DAT_IMAGELAYOUT\n", rc, status.ConditionCode); + if (rc != TWRC_SUCCESS) + return; + trace("ImageLayout [Left %x.%x|Top %x.%x|Right %x.%x|Bottom %x.%x|Document %d|Page %d|Frame %d]\n", + layout.Frame.Left.Whole, layout.Frame.Left.Frac, + layout.Frame.Top.Whole, layout.Frame.Top.Frac, + layout.Frame.Right.Whole, layout.Frame.Right.Frac, + layout.Frame.Bottom.Whole, layout.Frame.Bottom.Frac, + layout.DocumentNumber, layout.PageNumber, layout.FrameNumber); + + memset(&layout, 0, sizeof(layout)); + layout.Frame.Left.Whole = 1; + layout.Frame.Right.Whole = 2; + layout.Frame.Top.Whole = 1; + layout.Frame.Bottom.Whole = 2; + rc = pDSM_Entry(appid, source, DG_IMAGE, DAT_IMAGELAYOUT, MSG_SET, &layout); + get_condition_code(appid, source, &status); + ok(rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS, + "Error [rc %d|cc %d] doing MSG_SET for DG_IMAGE/DAT_IMAGELAYOUT\n", rc, status.ConditionCode); + if (rc != TWRC_SUCCESS) + return; + + rc = pDSM_Entry(appid, source, DG_IMAGE, DAT_IMAGELAYOUT, MSG_GET, &layout); + get_condition_code(appid, source, &status); + ok(rc == TWRC_SUCCESS && status.ConditionCode == TWCC_SUCCESS, + "Error [rc %d|cc %d] doing MSG_GET for DG_IMAGE/DAT_IMAGELAYOUT\n", rc, status.ConditionCode); + if (rc != TWRC_SUCCESS) + return; + trace("ImageLayout after set [Left %x.%x|Top %x.%x|Right %x.%x|Bottom %x.%x|Document %d|Page %d|Frame %d]\n", + layout.Frame.Left.Whole, layout.Frame.Left.Frac, + layout.Frame.Top.Whole, layout.Frame.Top.Frac, + layout.Frame.Right.Whole, layout.Frame.Right.Frac, + layout.Frame.Bottom.Whole, layout.Frame.Bottom.Frac, + layout.DocumentNumber, layout.PageNumber, layout.FrameNumber); +} + static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) { @@ -700,6 +745,8 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) test_supported_sizes(appid, source, TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET); + test_imagelayout(appid, source); + } }

1 0

Jeremy White : twain_32: Revise internal documentation and one test slightly to bring into line with TWAIN 1 .8 requirements.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 4b92f6c966f8158657422b3c8aa192107833e8b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b92f6c966f8158657422b3c8… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Wed Mar 11 10:28:20 2009 -0500 twain_32: Revise internal documentation and one test slightly to bring into line with TWAIN 1.8 requirements. --- dlls/twain_32/tests/dsm.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/twain_32/tests/dsm.c b/dlls/twain_32/tests/dsm.c index e46b0e0..835f09c 100644 --- a/dlls/twain_32/tests/dsm.c +++ b/dlls/twain_32/tests/dsm.c @@ -668,7 +668,7 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) } } - /* For Twain 1.6, all sources must support: */ + /* All sources must support: */ ok(capabilities[CAP_SUPPORTEDCAPS], "CAP_SUPPORTEDCAPS not supported\n"); ok(capabilities[CAP_XFERCOUNT], "CAP_XFERCOUNT not supported\n"); if (capabilities[CAP_XFERCOUNT]) @@ -680,7 +680,7 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) if (source->SupportedGroups & DG_IMAGE) { - /* For Twain 1.6: + /* Sources that supply image information must support DG_CONTROL / DAT_CAPABILITY / MSG_GET, MSG_GETCURRENT, MSG_GETDEFAULT on: */ @@ -701,9 +701,9 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) ok(capabilities[ICAP_PIXELFLAVOR], "ICAP_PIXELFLAVOR not supported\n"); if (capabilities[ICAP_PIXELFLAVOR]) test_onevalue_cap(appid, source, ICAP_PIXELFLAVOR, TWTY_UINT16, - TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET); + TWQC_GET | TWQC_GETDEFAULT | TWQC_GETCURRENT); - /* For Twain 1.6: + /* Sources that supply image information must support DG_CONTROL / DAT_CAPABILITY / MSG_GET, MSG_GETCURRENT, MSG_GETDEFAULT, MSG_RESET and MSG_SET on: */ @@ -745,6 +745,7 @@ static void test_single_source(TW_IDENTITY *appid, TW_IDENTITY *source) test_supported_sizes(appid, source, TWQC_GET | TWQC_SET | TWQC_GETDEFAULT | TWQC_GETCURRENT | TWQC_RESET); + /* Additional tests */ test_imagelayout(appid, source); }

1 0

Alexandre Julliard : oleaut32: Make typelib. dll into a stand-alone 16-bit module.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: 8a7089570d19a01417467b7921ec01186ad83286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a7089570d19a01417467b792… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 17:30:10 2009 +0100 oleaut32: Make typelib.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 +++++++++ configure.ac | 2 + dlls/Makefile.in | 3 +- dlls/oleaut32/Makefile.in | 6 +--- dlls/oleaut32/hash.c | 1 - dlls/typelib.dll16/Makefile.in | 15 +++++++++++++ .../typelib16.c => typelib.dll16/typelib.c} | 22 +++++++++++++++---- .../typelib.dll16.spec} | 2 +- 9 files changed, 48 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index cb01844..ac61c48 100644 --- a/.gitignore +++ b/.gitignore @@ -97,7 +97,6 @@ dlls/stdole32.tlb/std_ole_v1.tlb dlls/system.drv16 dlls/toolhelp.dll16 dlls/twain.dll16 -dlls/typelib.dll16 dlls/user.exe16 dlls/ver.dll16 dlls/w32sys.dll16 diff --git a/configure b/configure index c18840d..e9e3b50 100755 --- a/configure +++ b/configure @@ -3921,6 +3921,7 @@ then enable_olesvr_dll16=${enable_olesvr_dll16:-no} enable_storage_dll16=${enable_storage_dll16:-no} enable_stress_dll16=${enable_stress_dll16:-no} + enable_typelib_dll16=${enable_typelib_dll16:-no} enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} enable_vmm_vxd=${enable_vmm_vxd:-no} enable_vnbt_vxd=${enable_vnbt_vxd:-no} @@ -27226,6 +27227,14 @@ dlls/twain_32/tests/Makefile: dlls/twain_32/tests/Makefile.in dlls/Maketest.rule ac_config_files="$ac_config_files dlls/twain_32/tests/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/typelib.dll16/Makefile" +test "x$enable_typelib_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + typelib.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/typelib.dll16/Makefile: dlls/typelib.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/typelib.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/unicows/Makefile" test "x$enable_unicows" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ unicows" @@ -29337,6 +29346,7 @@ do "dlls/traffic/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/traffic/Makefile" ;; "dlls/twain_32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/Makefile" ;; "dlls/twain_32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/twain_32/tests/Makefile" ;; + "dlls/typelib.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/typelib.dll16/Makefile" ;; "dlls/unicows/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/unicows/Makefile" ;; "dlls/updspapi/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/updspapi/Makefile" ;; "dlls/url/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/url/Makefile" ;; diff --git a/configure.ac b/configure.ac index f4e34a9..56ee6ae 100644 --- a/configure.ac +++ b/configure.ac @@ -158,6 +158,7 @@ then enable_olesvr_dll16=${enable_olesvr_dll16:-no} enable_storage_dll16=${enable_storage_dll16:-no} enable_stress_dll16=${enable_stress_dll16:-no} + enable_typelib_dll16=${enable_typelib_dll16:-no} enable_vdhcp_vxd=${enable_vdhcp_vxd:-no} enable_vmm_vxd=${enable_vmm_vxd:-no} enable_vnbt_vxd=${enable_vnbt_vxd:-no} @@ -2242,6 +2243,7 @@ WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL WINE_CONFIG_MAKEFILE([dlls/traffic/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/twain_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/twain_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) +WINE_CONFIG_MAKEFILE([dlls/typelib.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/unicows/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/updspapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/url/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index 27783be..f5cdd1e 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -36,7 +36,6 @@ WIN16_FILES = \ system.drv16 \ toolhelp.dll16 \ twain.dll16 \ - typelib.dll16 \ user.exe16 \ ver.dll16 \ w32sys.dll16 \ @@ -78,7 +77,7 @@ krnl386.exe16 system.drv16 toolhelp.dll16: msvideo.dll16: echo "msvfw32.dll" >$@ -ole2disp.dll16 typelib.dll16: +ole2disp.dll16: echo "oleaut32.dll" >$@ rasapi16.dll16: diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index 56b96be..4ea761d 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -30,12 +30,10 @@ C_SRCS = \ vartype.c C_SRCS16 = \ - ole2disp.c \ - typelib16.c + ole2disp.c SPEC_SRCS16 = \ - ole2disp.spec \ - typelib.spec + ole2disp.spec RC_SRCS = oleaut32.rc diff --git a/dlls/oleaut32/hash.c b/dlls/oleaut32/hash.c index 6f6eebb..a2710df 100644 --- a/dlls/oleaut32/hash.c +++ b/dlls/oleaut32/hash.c @@ -486,7 +486,6 @@ static const unsigned char Lookup_224[128 * 3] = { /*********************************************************************** * LHashValOfNameSysA (OLEAUT32.166) - * LHashValOfNameSys (TYPELIB.4) * * Produce a string hash value. * diff --git a/dlls/typelib.dll16/Makefile.in b/dlls/typelib.dll16/Makefile.in new file mode 100644 index 0000000..d8d6c9a --- /dev/null +++ b/dlls/typelib.dll16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = typelib.dll16 +IMPORTS = oleaut32 advapi32 kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,oleaut32.dll + +SPEC_SRCS = typelib.dll16.spec + +C_SRCS = typelib.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/oleaut32/typelib16.c b/dlls/typelib.dll16/typelib.c similarity index 91% rename from dlls/oleaut32/typelib16.c rename to dlls/typelib.dll16/typelib.c index a7b2639..bf733ae 100644 --- a/dlls/oleaut32/typelib16.c +++ b/dlls/typelib.dll16/typelib.c @@ -33,11 +33,11 @@ #include "winerror.h" #include "windef.h" #include "winbase.h" +#include "wine/winbase16.h" #include "winreg.h" #include "winuser.h" - #include "objbase.h" -#include "ole2disp.h" +#include "oleauto.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -75,13 +75,14 @@ QueryPathOfRegTypeLib16( WORD wMaj, /* [in] Major version */ WORD wMin, /* [in] Minor version */ LCID lcid, /* [in] Locale Id */ - LPBSTR16 path) /* [out] Destination for the registry key name */ + SEGPTR *path) /* [out] Destination for the registry key name */ { char xguid[80]; char typelibkey[100],pathname[260]; LONG plen; + char *ret; - TRACE("\n"); + TRACE("\n"); if (HIWORD(guid)) { sprintf( typelibkey, "SOFTWARE\\Classes\\Typelib\\{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\\%d.%d\\%x\\win16", @@ -102,7 +103,10 @@ QueryPathOfRegTypeLib16( FIXME("key %s not found\n",typelibkey); return E_FAIL; } - *path = SysAllocString16(pathname); + ret = HeapAlloc( GetProcessHeap(), 0, strlen(pathname) + 1 ); + if (!ret) return E_FAIL; + strcpy( ret, pathname ); + *path = MapLS(ret); return S_OK; } @@ -130,6 +134,14 @@ HRESULT WINAPI LoadTypeLib16( return E_FAIL; } +/*********************************************************************** + * LHashValOfNameSys (TYPELIB.4) + */ +ULONG WINAPI LHashValOfNameSys16( SYSKIND skind, LCID lcid, LPCSTR lpStr) +{ + return LHashValOfNameSysA( skind, lcid, lpStr ); +} + /**************************************************************************** * OaBuildVersion (TYPELIB.15) * diff --git a/dlls/oleaut32/typelib.spec b/dlls/typelib.dll16/typelib.dll16.spec similarity index 85% rename from dlls/oleaut32/typelib.spec rename to dlls/typelib.dll16/typelib.dll16.spec index c994288..10f5d4c 100644 --- a/dlls/oleaut32/typelib.spec +++ b/dlls/typelib.dll16/typelib.dll16.spec @@ -1,6 +1,6 @@ 2 stub CREATETYPELIB 3 pascal LoadTypeLib(ptr ptr) LoadTypeLib16 -4 pascal LHashValOfNameSys(word long str) LHashValOfNameSysA +4 pascal LHashValOfNameSys(word long str) LHashValOfNameSys16 5 stub _IID_ICREATETYPEINFO 6 stub _IID_ICREATETYPELIB 7 stub _IID_ITYPECOMP

1 0

Alexandre Julliard : oleaut32: Make ole2disp. dll into a stand-alone 16-bit module.
by Alexandre Julliard 12 Mar '09

12 Mar '09

Module: wine Branch: master Commit: d5a4a6635e0b934cd7b6c75fe3f325a2fe1866c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5a4a6635e0b934cd7b6c75fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 11 17:36:40 2009 +0100 oleaut32: Make ole2disp.dll into a stand-alone 16-bit module. --- .gitignore | 1 - configure | 10 ++++++++++ configure.ac | 2 ++ dlls/Makefile.in | 4 ---- dlls/ole2disp.dll16/Makefile.in | 15 +++++++++++++++ dlls/{oleaut32 => ole2disp.dll16}/ole2disp.c | 0 .../ole2disp.dll16.spec} | 0 dlls/{oleaut32 => ole2disp.dll16}/ole2disp.h | 0 dlls/oleaut32/Makefile.in | 6 ------ 9 files changed, 27 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index ac61c48..50ce7fc 100644 --- a/.gitignore +++ b/.gitignore @@ -58,7 +58,6 @@ dlls/mstask/mstask_local.h dlls/mstask/mstask_local_i.c dlls/msvideo.dll16 dlls/msxml3/msxml3_v1.tlb -dlls/ole2disp.dll16 dlls/ole32/dcom.h dlls/ole32/dcom_p.c dlls/ole32/irot.h diff --git a/configure b/configure index e9e3b50..4ccd3bf 100755 --- a/configure +++ b/configure @@ -3914,6 +3914,7 @@ then enable_msacm_dll16=${enable_msacm_dll16:-no} enable_ole2_dll16=${enable_ole2_dll16:-no} enable_ole2conv_dll16=${enable_ole2conv_dll16:-no} + enable_ole2disp_dll16=${enable_ole2disp_dll16:-no} enable_ole2nls_dll16=${enable_ole2nls_dll16:-no} enable_ole2prox_dll16=${enable_ole2prox_dll16:-no} enable_ole2thk_dll16=${enable_ole2thk_dll16:-no} @@ -26507,6 +26508,14 @@ dlls/ole2conv.dll16/Makefile: dlls/ole2conv.dll16/Makefile.in dlls/Makedll.rules ac_config_files="$ac_config_files dlls/ole2conv.dll16/Makefile" ALL_MAKEFILES="$ALL_MAKEFILES \\ + dlls/ole2disp.dll16/Makefile" +test "x$enable_ole2disp_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ + ole2disp.dll16" +ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS +dlls/ole2disp.dll16/Makefile: dlls/ole2disp.dll16/Makefile.in dlls/Makedll.rules" +ac_config_files="$ac_config_files dlls/ole2disp.dll16/Makefile" + +ALL_MAKEFILES="$ALL_MAKEFILES \\ dlls/ole2nls.dll16/Makefile" test "x$enable_ole2nls_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\ ole2nls.dll16" @@ -29256,6 +29265,7 @@ do "dlls/odbccp32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/odbccp32/tests/Makefile" ;; "dlls/ole2.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2.dll16/Makefile" ;; "dlls/ole2conv.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2conv.dll16/Makefile" ;; + "dlls/ole2disp.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2disp.dll16/Makefile" ;; "dlls/ole2nls.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2nls.dll16/Makefile" ;; "dlls/ole2prox.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2prox.dll16/Makefile" ;; "dlls/ole2thk.dll16/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/ole2thk.dll16/Makefile" ;; diff --git a/configure.ac b/configure.ac index 56ee6ae..590ca4e 100644 --- a/configure.ac +++ b/configure.ac @@ -151,6 +151,7 @@ then enable_msacm_dll16=${enable_msacm_dll16:-no} enable_ole2_dll16=${enable_ole2_dll16:-no} enable_ole2conv_dll16=${enable_ole2conv_dll16:-no} + enable_ole2disp_dll16=${enable_ole2disp_dll16:-no} enable_ole2nls_dll16=${enable_ole2nls_dll16:-no} enable_ole2prox_dll16=${enable_ole2prox_dll16:-no} enable_ole2thk_dll16=${enable_ole2thk_dll16:-no} @@ -2153,6 +2154,7 @@ WINE_CONFIG_MAKEFILE([dlls/odbccp32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D WINE_CONFIG_MAKEFILE([dlls/odbccp32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests]) WINE_CONFIG_MAKEFILE([dlls/ole2.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole2conv.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) +WINE_CONFIG_MAKEFILE([dlls/ole2disp.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole2nls.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole2prox.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) WINE_CONFIG_MAKEFILE([dlls/ole2thk.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS]) diff --git a/dlls/Makefile.in b/dlls/Makefile.in index f5cdd1e..c08ce74 100644 --- a/dlls/Makefile.in +++ b/dlls/Makefile.in @@ -28,7 +28,6 @@ WIN16_FILES = \ krnl386.exe16 \ mmsystem.dll16 \ msvideo.dll16 \ - ole2disp.dll16 \ rasapi16.dll16 \ setupx.dll16 \ shell.dll16 \ @@ -77,9 +76,6 @@ krnl386.exe16 system.drv16 toolhelp.dll16: msvideo.dll16: echo "msvfw32.dll" >$@ -ole2disp.dll16: - echo "oleaut32.dll" >$@ - rasapi16.dll16: echo "rasapi32.dll" >$@ diff --git a/dlls/ole2disp.dll16/Makefile.in b/dlls/ole2disp.dll16/Makefile.in new file mode 100644 index 0000000..0a056b1 --- /dev/null +++ b/dlls/ole2disp.dll16/Makefile.in @@ -0,0 +1,15 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = ole2disp.dll16 +IMPORTS = kernel32 +EXTRADLLFLAGS = -Wb,--subsystem,win16,--main-module,oleaut32.dll + +SPEC_SRCS = ole2disp.dll16.spec + +C_SRCS = ole2disp.c + +(a)MAKE_DLL_RULES@ + +(a)DEPENDENCIES@ # everything below this line is overwritten by make depend diff --git a/dlls/oleaut32/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c similarity index 100% rename from dlls/oleaut32/ole2disp.c rename to dlls/ole2disp.dll16/ole2disp.c diff --git a/dlls/oleaut32/ole2disp.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec similarity index 100% rename from dlls/oleaut32/ole2disp.spec rename to dlls/ole2disp.dll16/ole2disp.dll16.spec diff --git a/dlls/oleaut32/ole2disp.h b/dlls/ole2disp.dll16/ole2disp.h similarity index 100% rename from dlls/oleaut32/ole2disp.h rename to dlls/ole2disp.dll16/ole2disp.h diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in index 4ea761d..cbc1ca1 100644 --- a/dlls/oleaut32/Makefile.in +++ b/dlls/oleaut32/Makefile.in @@ -29,12 +29,6 @@ C_SRCS = \ variant.c \ vartype.c -C_SRCS16 = \ - ole2disp.c - -SPEC_SRCS16 = \ - ole2disp.spec - RC_SRCS = oleaut32.rc IDL_P_SRCS = \

1 0