Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added new library Mpr and functions to Netapi32 #532

Merged
merged 1 commit into from
Nov 7, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ Next release
Features
--------
* [#526](https://github.com/java-native-access/jna/pull/526): Added initialization and conversion between Windows SYSTEMTIME and Java Calendar [@lgoldstein](https://github.com/lgoldstein)
* [#532](https://github.com/java-native-access/jna/pull/529): Added `com.sun.jna.platform.win32.Mpr`, `com.sun.jna.platform.win32.LmShare`, and `com.sun.jna.platform.win32.Winnetwk` - [@amarcionek](https://github.com/amarcionek).
* [#532](https://github.com/java-native-access/jna/pull/529): Added `ACCESS_*` definitions to `com.sun.jna.platform.win32.LmAccess` - [@amarcionek](https://github.com/amarcionek).
* [#532](https://github.com/java-native-access/jna/pull/529): Added `NetShareAdd` and `NetShareDel` to `com.sun.jna.platform.win32.Netapi32` - [@amarcionek](https://github.com/amarcionek).

Bug Fixes
---------
Expand All @@ -17,7 +20,7 @@ Release 4.2.1

Features
--------
* [#504](https://github.com/java-native-access/jna/pull/504): Add support for linux-sparcv9 [@alexvsimon](https://github.com/alexvsimon).
* [#504](https://github.com/java-native-access/jna/pull/504): Add support for linux-sparcv9 - [@alexvsimon](https://github.com/alexvsimon).
* [#510](https://github.com/java-native-access/jna/pull/510): Added `GetCommState`, `GetCommTimeouts` `SetCommState` and `SetCommTimeouts` to `com.sun.jna.platform.win32.Kernel32`. Added `DCB` structure to `com.sun.jna.platform.win32.WinBase` - [@MBollig](https://github.com/MBollig).
* [#512](https://github.com/java-native-access/jna/pull/512): Make loading debug flags mutable [@lwahonen](https://github.com/lwahonen).
* [#514](https://github.com/java-native-access/jna/pull/514): Added `host_processor_info` to `com.sun.jna.platform.mac.SystemB` - [@dbwiddis](https://github.com/dbwiddis).
Expand Down
19 changes: 18 additions & 1 deletion contrib/platform/src/com/sun/jna/platform/win32/LMAccess.java
Original file line number Diff line number Diff line change
Expand Up @@ -422,5 +422,22 @@ protected List getFieldOrder() {
int USER_PRIV_MASK = 3;
int USER_PRIV_GUEST = 0;
int USER_PRIV_USER = 1;
int USER_PRIV_ADMIN = 2;
int USER_PRIV_ADMIN = 2;

//
// Bit values for the access permissions. ACCESS_ALL is a handy
// way to specify maximum permissions. These are used in
// acl_access field of access_list structures.
//

int ACCESS_NONE = 0x00;
int ACCESS_READ = 0x01;
int ACCESS_WRITE = 0x02;
int ACCESS_CREATE = 0x04;
int ACCESS_EXEC = 0x08;
int ACCESS_DELETE = 0x10;
int ACCESS_ATRIB = 0x20;
int ACCESS_PERM = 0x40;
int ACCESS_ALL = ACCESS_READ | ACCESS_WRITE | ACCESS_CREATE | ACCESS_EXEC | ACCESS_DELETE | ACCESS_ATRIB | ACCESS_PERM;
int ACCESS_GROUP = 0x8000;
}
226 changes: 226 additions & 0 deletions contrib/platform/src/com/sun/jna/platform/win32/LMShare.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,226 @@
/* Copyright (c) 2015 Adam Marcionek, All Rights Reserved
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*/
package com.sun.jna.platform.win32;

import java.util.Arrays;
import java.util.List;

import com.sun.jna.Pointer;
import com.sun.jna.Structure;
import com.sun.jna.WString;
import com.sun.jna.win32.StdCallLibrary;

/**
* Ported from LMShare.h.
* Windows SDK 7.1
* @author amarcionek[at]seven10storage.com
*/
public interface LMShare extends StdCallLibrary {

//
// Share types (shi1_type and shi2_type fields).
//

/**
* Disk Drive.
*/
int STYPE_DISKTREE = 0;

/**
* Print Queue.
*/
int STYPE_PRINTQ = 1;

/**
* Communication device.
*/
int STYPE_DEVICE = 2;

/**
* Interprocess communication (IPC).
*/
int STYPE_IPC = 3;

/**
* A temporary share.
*/
int STYPE_TEMPORARY = 0x40000000;

/**
* Special share reserved for interprocess communication (IPC$) or remote administration of the server (ADMIN$).
* Can also refer to administrative shares such as C$, D$, E$, and so forth. For more information, see the network share functions.
*/
int STYPE_SPECIAL = 0x80000000;

/**
* Contains information about the shared resource, including name of the resource, type and permissions, number of connections, and other pertinent information.
*/
public static class SHARE_INFO_2 extends Structure {
public SHARE_INFO_2() {
super();
}

public SHARE_INFO_2(Pointer memory) {
super(memory);
read();
}

/**
* Pointer to a Unicode string specifying the name of a shared resource. Calls to the NetShareSetInfo function ignore this member.
*/
public WString shi2_netname;

/**
* A combination of values that specify the type of share. Calls to the NetShareSetInfo function ignore this member.
* One of the following values may be specified. You can isolate these values by using the STYPE_MASK value.
* STYPE_DISKTREE, STYPE_PRINTQ, STYPE_DEVICE, STYPE_IPC, STYPE_TEMPORARY, STYPE_SPECIAL
*/
public int shi2_type;

/**
* Pointer to a Unicode string specifying an optional comment about the shared resource.
*/
public WString shi2_remark;

/**
* Specifies a DWORD value that indicates the shared resource's permissions for servers running with share-level security.
* This member is ignored on a server running user-level security. This member can be any of the following values.
* Calls to the NetShareSetInfo function ignore this member. Note that Windows does not support share-level security.
* For more information about controlling access to securable objects, see Access Control, Privileges, and Securable Objects.
* NOTE: Bit masks are defined in LmAccess.Java
*/
public int shi2_permissions;

/**
* Specifies a DWORD value that indicates the maximum number of concurrent connections that the shared resource can accommodate.
* The number of connections is unlimited if the value specified in this member is -1.
*/
public int shi2_max_uses;

/**
* Specifies a DWORD value that indicates the number of current connections to the resource. Calls to the NetShareSetInfo function ignore this member.
*/
public int shi2_current_uses;

/**
* Pointer to a Unicode string that contains the local path for the shared resource. For disks, this member is the path being shared.
* For print queues, this member is the name of the print queue being shared. Calls to the NetShareSetInfo function ignore this member.
*/
public WString shi2_path;

/**
* Pointer to a Unicode string that specifies the share's password (when the server is running with share-level security). If the server is
* running with user-level security, this member is ignored. Note that Windows does not support share-level security.
* This member can be no longer than SHPWLEN+1 bytes (including a terminating null character). Calls to the NetShareSetInfo function ignore this member.
*/
public WString shi2_passwd;

protected List getFieldOrder() {
return Arrays.asList(new String[] { "shi2_netname",
"shi2_type",
"shi2_remark",
"shi2_permissions",
"shi2_max_uses",
"shi2_current_uses",
"shi2_path",
"shi2_passwd" });
}
}

/**
* Contains information about the shared resource, including name of the resource, type and permissions, number of connections, and other pertinent information.
*/
public static class SHARE_INFO_502 extends Structure {
public SHARE_INFO_502() {
super();
}

public SHARE_INFO_502(Pointer memory) {
super(memory);
read();
}

/**
* Pointer to a Unicode string specifying the name of a shared resource. Calls to the NetShareSetInfo function ignore this member.
*/
public WString shi502_netname;

/**
* A combination of values that specify the type of share. Calls to the NetShareSetInfo function ignore this member.
* One of the following values may be specified. You can isolate these values by using the STYPE_MASK value.
* STYPE_DISKTREE, STYPE_PRINTQ, STYPE_DEVICE, STYPE_IPC, STYPE_TEMPORARY, STYPE_SPECIAL
*/
public int shi502_type;

/**
* Pointer to a Unicode string specifying an optional comment about the shared resource.
*/
public WString shi502_remark;

/**
* Specifies a DWORD value that indicates the shared resource's permissions for servers running with share-level security.
* This member is ignored on a server running user-level security. This member can be any of the following values.
* Calls to the NetShareSetInfo function ignore this member. Note that Windows does not support share-level security.
* For more information about controlling access to securable objects, see Access Control, Privileges, and Securable Objects.
* NOTE: Bit masks are defined in LmAccess.Java
*/
public int shi502_permissions;

/**
* Specifies a DWORD value that indicates the maximum number of concurrent connections that the shared resource can accommodate.
* The number of connections is unlimited if the value specified in this member is -1.
*/
public int shi502_max_uses;

/**
* Specifies a DWORD value that indicates the number of current connections to the resource. Calls to the NetShareSetInfo function ignore this member.
*/
public int shi502_current_uses;

/**
* Pointer to a Unicode string that contains the local path for the shared resource. For disks, this member is the path being shared.
* For print queues, this member is the name of the print queue being shared. Calls to the NetShareSetInfo function ignore this member.
*/
public WString shi502_path;

/**
* Pointer to a Unicode string that specifies the share's password (when the server is running with share-level security). If the server is
* running with user-level security, this member is ignored. Note that Windows does not support share-level security.
* This member can be no longer than SHPWLEN+1 bytes (including a terminating null character). Calls to the NetShareSetInfo function ignore this member.
*/
public WString shi502_passwd;

/**
* Reserved; must be zero. Calls to the NetShareSetInfo function ignore this member.
*/
public int shi502_reserved;

/**
* Specifies the SECURITY_DESCRIPTOR associated with this share.
*/
public Pointer shi502_security_descriptor;

protected List getFieldOrder() {
return Arrays.asList(new String[] { "shi502_netname",
"shi502_type",
"shi502_remark",
"shi502_permissions",
"shi502_max_uses",
"shi502_current_uses",
"shi502_path",
"shi502_passwd",
"shi502_reserved",
"shi502_security_descriptor" });
}
}
}
Loading