add um::d2d1_1 / rep um::wincodec, more #409

ekicyou · 2017-03-23T04:27:42Z

cross reference is d2d1_1 and wincodec updates at the same time.

add(full impl)

um::d2d1_1
um::d2d1effects
um::d2d1effectauthor

replace(full impl)

um::wincodec

add(minimal impl)

um::documenttarget
um::ocidl

update(add interface)

um::ocidl(IErrorLog)
shared;;wtypes(CLIPFORMAT)

cross reference is d2d1_1 and wincodec updates at the same time. ## add(full impl) * um::d2d1_1 * um::d2d1effects * um::d2d1effectauthor ## replace(full impl) * um::wincodec ## add(minimal impl) * um::documenttarget * um::ocidl ## update(add interface) * um::ocidl(IErrorLog) * shared;;wtypes(CLIPFORMAT)

…ure/wincodec_d2d1_1

ekicyou · 2017-03-23T04:39:57Z

fnn...

error: cannot find macro `EXTERN!` in this scope

Make sure.

retep998 · 2017-03-23T04:32:42Z

src/um/d2d1effects.rs

+// except according to those terms.
+//! Mappings for the contents of d2d1effects.h
+
+DEFINE_GUID!{CLSID_D2D12DAffineTransform,        0x6AA97485, 0x6354, 0x4cfc, 0x90, 0x8C, 0xE4, 0xA7, 0x4F, 0x62, 0xC9, 0x6C}


The numbers should go on a second line, like so:

DEFINE_GUID!{CLSID_D2D12DAffineTransform, 0x6AA97485, 0x6354, 0x4cfc, 0x90, 0x8C, 0xE4, 0xA7, 0x4F, 0x62, 0xC9, 0x6C}

retep998 · 2017-03-23T04:32:54Z

src/um/d2d1effects.rs

@@ -0,0 +1,644 @@
+// Copyright © 2016-2017 winapi-rs developers


Shouldn't this be just 2017?

Referring to #308.
Change in 2017.

// Copyright © 2017 winapi-rs developers // Licensed under the Apache License, Version 2.0 // <LICENSE-APACHE or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license // <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option. // All files in the project carrying such notice may not be copied, modified, or distributed // except according to those terms.

Whenever adding a new file, the start year for the copyright should be the year that file was added. Since you're adding this file in 2017, the start year should be 2017.

retep998 · 2017-03-23T04:33:31Z

src/um/oaidl.rs

-use shared::wtypesbase::{
-    BYTE_SIZEDARR, DOUBLE, DWORD_SIZEDARR, HYPER_SIZEDARR, LPOLESTR, SCODE, WORD_SIZEDARR,
-};
+use shared::wtypes::{BSTR, CY, DATE, DECIMAL, VARIANT_BOOL, VARTYPE, VT_BSTR, VT_DISPATCH, VT_ERROR,


Please stick to the way the imports were indented before.

retep998 · 2017-03-23T04:33:59Z

src/um/wincodec.rs

@@ -1,373 +1,1973 @@
-// Copyright © 2015-2017 winapi-rs developers
+// Copyright © 2016-2017 winapi-rs developers


Don't change the start year.

retep998 · 2017-03-23T04:35:16Z

src/um/wincodec.rs

-use shared::basetsd::UINT32;
-use shared::guiddef::{GUID, REFGUID};
-use shared::minwindef::{BOOL, BYTE, DWORD, FLOAT, INT, UINT, ULONG};
+#![allow(overflowing_literals, unused_qualifications, unused)]


Why are you ignoring this lints?

retep998 · 2017-03-23T04:42:52Z

src/um/d2d1_1.rs

+               ID2D1BitmapBrush, ID2D1BitmapBrushVtbl, ID2D1PathGeometry, ID2D1PathGeometryVtbl,
+               ID2D1GradientStopCollection, ID2D1GradientStopCollectionVtbl, ID2D1DrawingStateBlock,
+               ID2D1DrawingStateBlockVtbl, ID2D1RenderTarget, ID2D1RenderTargetVtbl, ID2D1Factory,
+               ID2D1FactoryVtbl};


Please use block indentation for multiline imports.

retep998 · 2017-03-23T04:44:12Z

src/um/d2d1_1.rs

+    ) -> HRESULT,
+    fn GetPropertyNameLength(index: UINT32) -> UINT32,
+    fn GetType              (index: UINT32) -> D2D1_PROPERTY_TYPE,
+    fn GetPropertyIndex     (name: PCWSTR)  -> UINT32,


No aligned indentation.

retep998 · 2017-03-23T04:45:27Z

src/um/wincodec.rs

-interface IWICBitmapFlipRotator(IWICBitmapFlipRotatorVtbl)
-    : IWICBitmapSource(IWICBitmapSourceVtbl) {
+
+RIDL!(#[uuid(0x5009834F, 0x2D6A, 0x41ce, 0x9E, 0x1B, 0x17, 0xC5, 0xAF, 0xF7, 0xA7, 0x82)]


uuids should be lowercase hex.

Horrible mistake manual numeric editing. Want to follow the original description.

I actually used a bit of C++ code to print out the uuids for me with the correct formatting and casing, and then I'd copy the output over.

#define PRINT_ID(x) cout << "0x" << setw(8) << x.Data1 << ", 0x" << setw(4) << x.Data2 << ", 0x" << setw(4) << x.Data3 << ", 0x" << setw(2) << (unsigned)x.Data4[0] << ", 0x" << setw(2) << (unsigned)x.Data4[1] << ", 0x" << setw(2) << (unsigned)x.Data4[2] << ", 0x" << setw(2) << (unsigned)x.Data4[3] << ", 0x" << setw(2) << (unsigned)x.Data4[4] << ", 0x" << setw(2) << (unsigned)x.Data4[5] << ", 0x" << setw(2) << (unsigned)x.Data4[6] << ", 0x" << setw(2) << (unsigned)x.Data4[7]; #define PRINT_UUID(x) cout << hex << setfill('0') << "RIDL!{#[uuid("; PRINT_ID(__uuidof(x)); cout << ")]\ninterface "#x << endl; int main() { PRINT_UUID(IUnknown); }

Refer to,
consider the automatic processing.

retep998 · 2017-03-23T05:07:29Z

src/um/d2d1_1.rs

+    pub fn D2D1CreateDevice(dxgiDevice: *const IDXGIDevice,
+                            creationProperties: *const D2D1_CREATION_PROPERTIES,
+                            d2dDevice: *mut *mut ID2D1Device)
+                            -> HRESULT;


Block indentation please!

retep998 · 2017-03-23T06:06:48Z

src/um/wincodec.rs

@@ -1,369 +1,1975 @@
-// Copyright © 2015-2017 winapi-rs developers
+// Copyright © 2017 winapi-rs developers


Don't change the start year of existing files.

retep998 · 2017-03-23T06:18:52Z

src/um/d2d1_1.rs

+    fn GetExtendModeX      () -> D2D1_EXTEND_MODE,
+    fn GetExtendModeY      () -> D2D1_EXTEND_MODE,
+    fn GetInterpolationMode() -> D2D1_INTERPOLATION_MODE,
+    fn GetSourceRectangle  (sourceRectangle: *mut D2D1_RECT_F) -> c_void


Oh no! Not the aligned indentation!

ekicyou · 2017-03-23T07:06:30Z

Fix all.

…ure/wincodec_d2d1_1

retep998 · 2017-03-23T23:17:28Z

PR has conflicts.

retep998 · 2017-03-24T04:34:12Z

src/um/wincodec.rs

+use shared::guiddef::{REFGUID, GUID, CLSID, REFCLSID};
+use shared::dxgiformat::DXGI_FORMAT;
+use shared::dxgitype::{DXGI_JPEG_AC_HUFFMAN_TABLE, DXGI_JPEG_DC_HUFFMAN_TABLE,
+                       DXGI_JPEG_QUANTIZATION_TABLE};


These imports need to be block indented.

…ure/wincodec_d2d1_1 # Conflicts: # src/um/wincodec.rs

ekicyou · 2017-03-24T09:15:51Z

Sorry, The marge build will fail.
"FN!" Out the error.
There is a problem?

retep998 · 2017-03-24T13:54:44Z

FN! and RIDL! were recently changed to require trailing commas, so you'll have to add a bunch of commas.

ekicyou · 2017-03-24T15:32:23Z

FN!, RIDL! Fix
Bat test fail. #412

retep998 · 2017-03-24T16:36:59Z

That test is just checking that the imports are in alphabetical order, both the order of the use statements relative to each order, and the order of things inside each use statement.

…ure/wincodec_d2d1_1

ekicyou · 2017-03-25T02:16:19Z

Thank you! Try again.
prease check #416 request.

retep998 · 2017-03-25T02:23:42Z

src/um/wincodec.rs

+ENUM!{enum WICJpegIndexingOptions {
+   WICJpegIndexingOptionsGenerateOnDemand = 0x00000000,
+   WICJpegIndexingOptionsGenerateOnLoad = 0x00000001,
+   WICJpegIndexingOptions_FORCE_DWORD = CODEC_FORCE_DWORD,


Why is this indented by only 3 spaces? I see several cases of this across this file.

ekicyou · 2017-03-25T04:29:48Z

Fixed.

ekicyou added 6 commits March 23, 2017 11:56

use update

a3912d0

use update

b4276d9

use update

0fe2100

use update

d44429e

Merge branch 'dev' of https://github.com/retep998/winapi-rs into feat…

c468696

…ure/wincodec_d2d1_1

retep998 requested changes Mar 23, 2017

View reviewed changes

ekicyou added 2 commits March 23, 2017 13:56

remove EXTERN!

17a240d

merge

2eebe96

retep998 reviewed Mar 23, 2017

View reviewed changes

ekicyou added 2 commits March 23, 2017 14:44

copyright fix

3cccf49

fix indent

c19d825

retep998 reviewed Mar 23, 2017

View reviewed changes

copyright fix

d381325

retep998 reviewed Mar 23, 2017

View reviewed changes

ekicyou added 2 commits March 23, 2017 15:49

uuid lowercase

94633f0

interface remove aligned

990d691

ekicyou added 2 commits March 23, 2017 17:13

indent update

2c458a7

Merge branch 'dev' of https://github.com/retep998/winapi-rs into feat…

0222165

…ure/wincodec_d2d1_1

retep998 approved these changes Mar 23, 2017

View reviewed changes

retep998 reviewed Mar 24, 2017

View reviewed changes

ekicyou added 2 commits March 24, 2017 16:33

Merge branch 'dev' of https://github.com/retep998/winapi-rs into feat…

fbc95c3

…ure/wincodec_d2d1_1 # Conflicts: # src/um/wincodec.rs

block indented

2c66ae2

ekicyou added 2 commits March 24, 2017 23:52

FN!, RIDL! update

49cdbec

How do I? #412, #410

a6537c9

ekicyou added 2 commits March 25, 2017 10:13

Merge branch 'dev' of https://github.com/retep998/winapi-rs into feat…

cd7cf1c

…ure/wincodec_d2d1_1

fix test check_imports_sorting

d3e9eda

ekicyou mentioned this pull request Mar 25, 2017

test check_imports_sorting , Easy to use(2) #416

Open

retep998 reviewed Mar 25, 2017

View reviewed changes

ekicyou added 3 commits March 25, 2017 11:59

indent 3 --> 4

dd8e554

indent {6,7} --> 8

8ecd1bf

indent update

ec200a7

retep998 merged commit d77d5b7 into retep998:dev Mar 26, 2017

ekicyou deleted the feature/wincodec_d2d1_1 branch March 26, 2017 23:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add um::d2d1_1 / rep um::wincodec, more #409

add um::d2d1_1 / rep um::wincodec, more #409

ekicyou commented Mar 23, 2017

ekicyou commented Mar 23, 2017

retep998 Mar 23, 2017

retep998 Mar 23, 2017

ekicyou Mar 23, 2017

retep998 Mar 23, 2017

retep998 Mar 23, 2017

retep998 Mar 23, 2017

retep998 Mar 23, 2017

retep998 Mar 23, 2017

retep998 Mar 23, 2017

retep998 Mar 23, 2017

ekicyou Mar 23, 2017

retep998 Mar 23, 2017

ekicyou Mar 23, 2017

retep998 Mar 23, 2017

retep998 Mar 23, 2017

retep998 Mar 23, 2017

ekicyou commented Mar 23, 2017

retep998 commented Mar 23, 2017

retep998 Mar 24, 2017

ekicyou commented Mar 24, 2017

retep998 commented Mar 24, 2017

ekicyou commented Mar 24, 2017

retep998 commented Mar 24, 2017

ekicyou commented Mar 25, 2017

retep998 Mar 25, 2017

ekicyou commented Mar 25, 2017

		@@ -0,0 +1,644 @@
		// Copyright © 2016-2017 winapi-rs developers

		@@ -1,373 +1,1973 @@
		// Copyright © 2015-2017 winapi-rs developers
		// Copyright © 2016-2017 winapi-rs developers

		@@ -1,369 +1,1975 @@
		// Copyright © 2015-2017 winapi-rs developers
		// Copyright © 2017 winapi-rs developers

add um::d2d1_1 / rep um::wincodec, more #409

add um::d2d1_1 / rep um::wincodec, more #409

Conversation

ekicyou commented Mar 23, 2017

add(full impl)

replace(full impl)

add(minimal impl)

update(add interface)

ekicyou commented Mar 23, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ekicyou commented Mar 23, 2017

retep998 commented Mar 23, 2017

Choose a reason for hiding this comment

ekicyou commented Mar 24, 2017

retep998 commented Mar 24, 2017

ekicyou commented Mar 24, 2017

retep998 commented Mar 24, 2017

ekicyou commented Mar 25, 2017

Choose a reason for hiding this comment

ekicyou commented Mar 25, 2017