Skip to content

Commit

Permalink
auto merge of #13567 : iancormac84/rust/libc_windows_guid_fix, r=alex…
Browse files Browse the repository at this point in the history
…crichton

structure's Data2 and Data3 members expect WORD types instead of DWORD. I
discovered this discrepancy while experimenting with some bindings to
Microsoft's OLE2 api. The discrepancy was corrupting the contents of the
string returned by UuidToString after I used known GUIDs to test the
accuracy of the function binding. I didn't add test cases because it would
mean adding a dependency to my rather incomplete binding library. However,
the fix produces expected string values when tested.
  • Loading branch information
bors committed Apr 17, 2014
2 parents d8fa106 + fc4c6ee commit 1fd7de8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/liblibc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1221,8 +1221,8 @@ pub mod types {

pub struct GUID {
pub Data1: DWORD,
pub Data2: DWORD,
pub Data3: DWORD,
pub Data2: WORD,
pub Data3: WORD,
pub Data4: [BYTE, ..8],
}

Expand Down

0 comments on commit 1fd7de8

Please sign in to comment.