#include "includes.h"
#include "lib/registry/registry.h"
#include "system/filesys.h"
-#include "param/param.h"
#include "librpc/gen_ndr/winreg.h"
struct preg_data {
int fd;
TALLOC_CTX *ctx;
- struct smb_iconv_convenience *ic;
};
-static WERROR preg_read_utf16(struct smb_iconv_convenience *ic, int fd, char *c)
+static WERROR preg_read_utf16(int fd, char *c)
{
uint16_t v;
if (read(fd, &v, 2) < 2) {
return WERR_GENERAL_FAILURE;
}
- push_codepoint(ic, c, v);
+ push_codepoint(c, v);
return WERR_OK;
}
-static WERROR preg_write_utf16(struct smb_iconv_convenience *ic, int fd, const char *string)
+static WERROR preg_write_utf16(int fd, const char *string)
{
codepoint_t v;
uint16_t i;
size_t size;
for (i = 0; i < strlen(string); i+=size) {
- v = next_codepoint(ic, &string[i], &size);
+ v = next_codepoint(&string[i], &size);
if (write(fd, &v, 2) < 2) {
return WERR_GENERAL_FAILURE;
}
const char *value_name,
uint32_t value_type, DATA_BLOB value_data)
{
- struct preg_data *data = _data;
+ struct preg_data *data = (struct preg_data *)_data;
uint32_t buf;
- preg_write_utf16(data->ic, data->fd, "[");
- preg_write_utf16(data->ic, data->fd, key_name);
- preg_write_utf16(data->ic, data->fd, ";");
- preg_write_utf16(data->ic, data->fd, value_name);
- preg_write_utf16(data->ic, data->fd, ";");
+ preg_write_utf16(data->fd, "[");
+ preg_write_utf16(data->fd, key_name);
+ preg_write_utf16(data->fd, ";");
+ preg_write_utf16(data->fd, value_name);
+ preg_write_utf16(data->fd, ";");
SIVAL(&buf, 0, value_type);
write(data->fd, &buf, sizeof(uint32_t));
- preg_write_utf16(data->ic, data->fd, ";");
+ preg_write_utf16(data->fd, ";");
SIVAL(&buf, 0, value_data.length);
write(data->fd, &buf, sizeof(uint32_t));
- preg_write_utf16(data->ic, data->fd, ";");
+ preg_write_utf16(data->fd, ";");
write(data->fd, value_data.data, value_data.length);
- preg_write_utf16(data->ic, data->fd, "]");
+ preg_write_utf16(data->fd, "]");
return WERR_OK;
}
static WERROR reg_preg_diff_del_key(void *_data, const char *key_name)
{
- struct preg_data *data = _data;
+ struct preg_data *data = (struct preg_data *)_data;
char *parent_name;
DATA_BLOB blob;
parent_name = talloc_strndup(data->ctx, key_name, strrchr(key_name, '\\')-key_name);
- blob.data = (void *)talloc_strndup(data->ctx, key_name+(strrchr(key_name, '\\')-key_name)+1,
+ blob.data = (uint8_t *)talloc_strndup(data->ctx, key_name+(strrchr(key_name, '\\')-key_name)+1,
strlen(key_name)-(strrchr(key_name, '\\')-key_name));
blob.length = strlen((char *)blob.data)+1;
static WERROR reg_preg_diff_del_value(void *_data, const char *key_name,
const char *value_name)
{
- struct preg_data *data = _data;
+ struct preg_data *data = (struct preg_data *)_data;
char *val;
DATA_BLOB blob;
val = talloc_asprintf(data->ctx, "**Del.%s", value_name);
- blob.data = (void *)talloc(data->ctx, uint32_t);
- *(uint32_t *)blob.data = 0;
+ blob.data = (uint8_t *)talloc(data->ctx, uint32_t);
+ SIVAL(blob.data, 0, 0);
blob.length = 4;
return reg_preg_diff_set_value(data, key_name, val, REG_DWORD, blob);
}
static WERROR reg_preg_diff_del_all_values(void *_data, const char *key_name)
{
- struct preg_data *data = _data;
+ struct preg_data *data = (struct preg_data *)_data;
DATA_BLOB blob;
- blob.data = (void *)talloc(data->ctx, uint32_t);
- *(uint32_t *)blob.data = 0;
+ blob.data = (uint8_t *)talloc(data->ctx, uint32_t);
+ SIVAL(blob.data, 0, 0);
blob.length = 4;
return reg_preg_diff_set_value(data, key_name, "**DelVals.", REG_DWORD, blob);
write(data->fd, (uint8_t *)&preg_header,8);
data->ctx = ctx;
- data->ic = ic;
*callbacks = talloc(ctx, struct reg_diff_callbacks);
while(1) {
uint32_t value_type, length;
- if (!W_ERROR_IS_OK(preg_read_utf16(iconv_convenience, fd, buf_ptr))) {
+ if (!W_ERROR_IS_OK(preg_read_utf16(fd, buf_ptr))) {
break;
}
if (*buf_ptr != '[') {
/* Get the path */
buf_ptr = buf;
- while (W_ERROR_IS_OK(preg_read_utf16(iconv_convenience, fd, buf_ptr)) &&
+ while (W_ERROR_IS_OK(preg_read_utf16(fd, buf_ptr)) &&
*buf_ptr != ';' && buf_ptr-buf < buf_size) {
buf_ptr++;
}
/* Get the name */
buf_ptr = buf;
- while (W_ERROR_IS_OK(preg_read_utf16(iconv_convenience, fd, buf_ptr)) &&
+ while (W_ERROR_IS_OK(preg_read_utf16(fd, buf_ptr)) &&
*buf_ptr != ';' && buf_ptr-buf < buf_size) {
buf_ptr++;
}
/* Read past delimiter */
buf_ptr = buf;
- if (!(W_ERROR_IS_OK(preg_read_utf16(iconv_convenience, fd, buf_ptr)) &&
+ if (!(W_ERROR_IS_OK(preg_read_utf16(fd, buf_ptr)) &&
*buf_ptr == ';') && buf_ptr-buf < buf_size) {
DEBUG(0, ("Error in PReg file.\n"));
ret = WERR_GENERAL_FAILURE;
}
/* Read past delimiter */
buf_ptr = buf;
- if (!(W_ERROR_IS_OK(preg_read_utf16(iconv_convenience, fd, buf_ptr)) &&
+ if (!(W_ERROR_IS_OK(preg_read_utf16(fd, buf_ptr)) &&
*buf_ptr == ';') && buf_ptr-buf < buf_size) {
DEBUG(0, ("Error in PReg file.\n"));
ret = WERR_GENERAL_FAILURE;
/* Check if delimiter is in place (whine if it isn't) */
buf_ptr = buf;
- if (!(W_ERROR_IS_OK(preg_read_utf16(iconv_convenience, fd, buf_ptr)) &&
+ if (!(W_ERROR_IS_OK(preg_read_utf16(fd, buf_ptr)) &&
*buf_ptr == ']') && buf_ptr-buf < buf_size) {
DEBUG(0, ("Warning: Missing ']' in PReg file, expected ']', got '%c' 0x%x.\n",
*buf_ptr, *buf_ptr));