March 2021 - Wine-devel - list.winehq.org

[PATCH 3/5] riched20: Use TxDraw() to implement the host's WM_PAINT handler.
by Huw Davies 24 Mar '21

24 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.h | 2 +- dlls/riched20/txthost.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 075fe534783..929e10a3179 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -390,7 +390,7 @@ extern const struct ITextServicesVtbl text_services_stdcall_vtbl DECLSPEC_HIDDEN #define TXTSERV_VTABLE(This) (This)->lpVtbl #endif #define ITextServices_TxSendMessage(This,a,b,c,d) TXTSERV_VTABLE(This)->TxSendMessage(This,a,b,c,d) -#define ITextServices_TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) TXTSERV_VTABLE(This)->ITextServices_TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) +#define ITextServices_TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) TXTSERV_VTABLE(This)->TxDraw(This,a,b,c,d,e,f,g,h,i,j,k,l) #define ITextServices_TxGetHScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetHScroll(This,a,b,c,d,e) #define ITextServices_TxGetVScroll(This,a,b,c,d,e) TXTSERV_VTABLE(This)->TxGetVScroll(This,a,b,c,d,e) #define ITextServices_OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) TXTSERV_VTABLE(This)->OnTxSetCursor(This,a,b,c,d,e,f,g,h,i) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 1fd989d5ed4..2c832db6a76 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1219,7 +1219,8 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, ps.rcPaint.right = editor->rcFormat.right; } - editor_draw( editor, hdc, &ps.rcPaint ); + ITextServices_TxDraw( host->text_srv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, NULL, NULL, + &ps.rcPaint, NULL, 0, TXTVIEW_ACTIVE ); DeleteObject( SelectObject( hdc, brush ) ); EndPaint( editor->hWnd, &ps ); return 0; -- 2.23.0

1 0

[PATCH 2/5] riched20: Send EN_UPDATE from text services.
by Huw Davies 24 Mar '21

24 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/paint.c | 5 ++++- dlls/riched20/txthost.c | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 0addf7d5656..4704f43c2c3 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -132,11 +132,14 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) editor_ensure_visible( editor, &editor->pCursors[0] ); update_caret( editor ); + + if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) + ME_SendOldNotify( editor, EN_UPDATE ); + ITextHost_TxViewChange(editor->texthost, update_now); ME_SendSelChange(editor); - /* send EN_CHANGE if the event mask asks for it */ if(editor->nEventMask & ENM_CHANGE) { editor->nEventMask &= ~ENM_CHANGE; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 9e384d0c503..1fd989d5ed4 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1187,8 +1187,6 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); hdc = BeginPaint( editor->hWnd, &ps ); - if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) - ME_SendOldNotify( editor, EN_UPDATE ); brush = SelectObject( hdc, brush ); /* Erase area outside of the formatting rectangle */ -- 2.23.0

1 0

[PATCH 1/5] riched20: Don't call update_caret() from the host.
by Huw Davies 24 Mar '21

24 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 1 - dlls/riched20/paint.c | 1 + dlls/riched20/txthost.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 293ac0bad5a..4f66220d230 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1795,7 +1795,6 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre if (!(format & SFF_SELECTION)) { ME_ClearTempStyle(editor); } - update_caret(editor); ME_SendSelChange(editor); ME_SendRequestResize(editor, FALSE); diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 4be76e441d0..0addf7d5656 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -131,6 +131,7 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now) /* Ensure that the cursor is visible */ editor_ensure_visible( editor, &editor->pCursors[0] ); + update_caret( editor ); ITextHost_TxViewChange(editor->texthost, update_now); ME_SendSelChange(editor); diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index ab13879c664..9e384d0c503 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1186,7 +1186,6 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, PAINTSTRUCT ps; HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); - update_caret( editor ); hdc = BeginPaint( editor->hWnd, &ps ); if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE)) ME_SendOldNotify( editor, EN_UPDATE ); -- 2.23.0

1 0

[PATCH 2/2] winedump: Dump more fields for EMR_EXTTEXTOUTW records.
by Zhiyi Zhang 24 Mar '21

24 Mar '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- tools/winedump/emf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index f3c92ac0539..d44f7a806a5 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -357,7 +357,9 @@ static int dump_emfrecord(void) const EMREXTTEXTOUTW *etoW = PRD(offset, sizeof(*etoW)); printf("%-20s %08x\n", "EMR_EXTTEXTOUTW", length); - printf("pt (%d,%d) rect (%d,%d - %d,%d) flags %#x, %s\n", + printf("bounds (%d,%d - %d,%d) mode %#x x_scale %f y_scale %f pt (%d,%d) rect (%d,%d - %d,%d) flags %#x, %s\n", + etoW->rclBounds.left, etoW->rclBounds.top, etoW->rclBounds.right, etoW->rclBounds.bottom, + etoW->iGraphicsMode, etoW->exScale, etoW->eyScale, etoW->emrtext.ptlReference.x, etoW->emrtext.ptlReference.y, etoW->emrtext.rcl.left, etoW->emrtext.rcl.top, etoW->emrtext.rcl.right, etoW->emrtext.rcl.bottom, -- 2.27.0

1 0

[PATCH 1/2] winedump: Dump EMR_HEADER record.
by Zhiyi Zhang 24 Mar '21

24 Mar '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- tools/winedump/emf.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index cce66c838b6..f3c92ac0539 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -93,7 +93,22 @@ static int dump_emfrecord(void) switch(type) { - EMRCASE(EMR_HEADER); + case EMR_HEADER: + { + const ENHMETAHEADER *header = PRD(offset, sizeof(*header)); + + printf("%-20s %08x\n", "EMR_HEADER", length); + printf("bounds (%d,%d - %d,%d) frame (%d,%d - %d,%d) signature %#x version %#x bytes %#x records %#x\n" + "handles %#x reserved %#x palette entries %#x px %dx%d mm %dx%d μm %dx%d opengl %d description %s\n", + header->rclBounds.left, header->rclBounds.top, header->rclBounds.right, header->rclBounds.bottom, + header->rclFrame.left, header->rclFrame.top, header->rclFrame.right, header->rclFrame.bottom, + header->dSignature, header->nVersion, header->nBytes, header->nRecords, header->nHandles, header->sReserved, + header->nPalEntries, header->szlDevice.cx, header->szlDevice.cy, header->szlMillimeters.cx, + header->szlMillimeters.cy, header->szlMicrometers.cx, header->szlMicrometers.cy, header->bOpenGL, + debugstr_wn((LPCWSTR)((const BYTE *)header + header->offDescription), header->nDescription)); + break; + } + EMRCASE(EMR_POLYBEZIER); EMRCASE(EMR_POLYGON); EMRCASE(EMR_POLYLINE); -- 2.27.0

1 0

[PATCH 1/5] reg: Use malloc(), realloc() and free() from stdlib.h instead of wine/heap.h
by Hugh McMaster 24 Mar '21

24 Mar '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/add.c | 15 +++++++-------- programs/reg/delete.c | 8 ++++---- programs/reg/export.c | 45 +++++++++++++++++++++---------------------- programs/reg/import.c | 43 ++++++++++++++++++++--------------------- programs/reg/query.c | 42 ++++++++++++++++++++-------------------- programs/reg/reg.c | 35 +++++---------------------------- programs/reg/reg.h | 4 +--- 7 files changed, 81 insertions(+), 111 deletions(-) diff --git a/programs/reg/add.c b/programs/reg/add.c index 054023df7ab..3d0a509b4f0 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -17,7 +17,6 @@ */ #include <errno.h> -#include <stdlib.h> #include "reg.h" static DWORD wchar_get_type(const WCHAR *type_name) @@ -64,7 +63,7 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW case REG_EXPAND_SZ: { *reg_count = (lstrlenW(data) + 1) * sizeof(WCHAR); - out_data = heap_xalloc(*reg_count); + out_data = malloc(*reg_count); lstrcpyW((LPWSTR)out_data,data); break; } @@ -80,7 +79,7 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW break; } *reg_count = sizeof(DWORD); - out_data = heap_xalloc(*reg_count); + out_data = malloc(*reg_count); ((LPDWORD)out_data)[0] = val; break; } @@ -89,7 +88,7 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW BYTE hex0, hex1; int i = 0, destByteIndex = 0, datalen = lstrlenW(data); *reg_count = ((datalen + datalen % 2) / 2) * sizeof(BYTE); - out_data = heap_xalloc(*reg_count); + out_data = malloc(*reg_count); if(datalen % 2) { hex1 = hexchar_to_byte(data[i++]); @@ -108,7 +107,7 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW break; no_hex_data: /* cleanup, print error */ - heap_free(out_data); + free(out_data); output_message(STRING_MISSING_HEXDATA); out_data = NULL; break; @@ -116,7 +115,7 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW case REG_MULTI_SZ: { int i, destindex, len = lstrlenW(data); - WCHAR *buffer = heap_xalloc((len + 2) * sizeof(WCHAR)); + WCHAR *buffer = malloc((len + 2) * sizeof(WCHAR)); for (i = 0, destindex = 0; i < len; i++, destindex++) { @@ -132,7 +131,7 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW if (destindex && !buffer[destindex - 1] && (!buffer[destindex] || destindex == 1)) { - heap_free(buffer); + free(buffer); output_message(STRING_INVALID_STRING); return NULL; } @@ -201,7 +200,7 @@ int reg_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, } RegSetValueExW(key, value_name, 0, reg_type, reg_data, reg_count); - heap_free(reg_data); + free(reg_data); } RegCloseKey(key); diff --git a/programs/reg/delete.c b/programs/reg/delete.c index e0730e5c12f..6ead3fc6919 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -65,7 +65,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, WCHAR *value_name; LONG rc; - value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); + value_name = malloc(max_value_len * sizeof(WCHAR)); while (1) { @@ -76,7 +76,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, rc = RegDeleteValueW(key, value_name); if (rc != ERROR_SUCCESS) { - heap_free(value_name); + free(value_name); RegCloseKey(key); output_message(STRING_VALUEALL_FAILED, key_name); return 1; @@ -85,11 +85,11 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, else if (rc == ERROR_MORE_DATA) { max_value_len *= 2; - value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); + value_name = realloc(value_name, max_value_len * sizeof(WCHAR)); } else break; } - heap_free(value_name); + free(value_name); } else if (value_name || value_empty) { diff --git a/programs/reg/export.c b/programs/reg/export.c index 8ce1945a693..30f01c8b94f 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -17,7 +17,6 @@ */ #include <stdio.h> -#include <stdlib.h> #include "reg.h" static void write_file(HANDLE hFile, const WCHAR *str) @@ -42,7 +41,7 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len) escape_count++; } - buf = heap_xalloc((str_len + escape_count + 1) * sizeof(WCHAR)); + buf = malloc((str_len + escape_count + 1) * sizeof(WCHAR)); for (i = 0, pos = 0; i < str_len; i++, pos++) { @@ -87,11 +86,11 @@ static size_t export_value_name(HANDLE hFile, WCHAR *name, size_t len) if (name && *name) { WCHAR *str = escape_string(name, len, &line_len); - WCHAR *buf = heap_xalloc((line_len + 4) * sizeof(WCHAR)); + WCHAR *buf = malloc((line_len + 4) * sizeof(WCHAR)); line_len = swprintf(buf, line_len + 4, quoted_fmt, str); write_file(hFile, buf); - heap_free(buf); - heap_free(str); + free(buf); + free(str); } else { @@ -111,16 +110,16 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) if (size) len = size / sizeof(WCHAR) - 1; str = escape_string(data, len, &line_len); - *buf = heap_xalloc((line_len + 3) * sizeof(WCHAR)); + *buf = malloc((line_len + 3) * sizeof(WCHAR)); swprintf(*buf, line_len + 3, fmt, str); - heap_free(str); + free(str); } static void export_dword_data(WCHAR **buf, DWORD *data) { static const WCHAR fmt[] = {'d','w','o','r','d',':','%','0','8','x',0}; - *buf = heap_xalloc(15 * sizeof(WCHAR)); + *buf = malloc(15 * sizeof(WCHAR)); swprintf(*buf, 15, fmt, *data); } @@ -137,10 +136,10 @@ static size_t export_hex_data_type(HANDLE hFile, DWORD type) } else { - WCHAR *buf = heap_xalloc(15 * sizeof(WCHAR)); + WCHAR *buf = malloc(15 * sizeof(WCHAR)); line_len = swprintf(buf, 15, hexp_fmt, type); write_file(hFile, buf); - heap_free(buf); + free(buf); } return line_len; @@ -160,7 +159,7 @@ static void export_hex_data(HANDLE hFile, WCHAR **buf, DWORD type, if (!size) return; num_commas = size - 1; - *buf = heap_xalloc(size * 3 * sizeof(WCHAR)); + *buf = malloc(size * 3 * sizeof(WCHAR)); for (i = 0, pos = 0; i < size; i++) { @@ -217,7 +216,7 @@ static void export_data(HANDLE hFile, WCHAR *value_name, DWORD value_len, if (size || type == REG_SZ) { write_file(hFile, buf); - heap_free(buf); + free(buf); } export_newline(hFile); @@ -228,10 +227,10 @@ static void export_key_name(HANDLE hFile, WCHAR *name) static const WCHAR fmt[] = {'\r','\n','[','%','s',']','\r','\n',0}; WCHAR *buf; - buf = heap_xalloc((lstrlenW(name) + 7) * sizeof(WCHAR)); + buf = malloc((lstrlenW(name) + 7) * sizeof(WCHAR)); swprintf(buf, lstrlenW(name) + 7, fmt, name); write_file(hFile, buf); - heap_free(buf); + free(buf); } static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) @@ -247,8 +246,8 @@ static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) export_key_name(hFile, path); - value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); - data = heap_xalloc(max_data_bytes); + value_name = malloc(max_value_len * sizeof(WCHAR)); + data = malloc(max_data_bytes); i = 0; for (;;) @@ -267,21 +266,21 @@ static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) if (data_size > max_data_bytes) { max_data_bytes = data_size; - data = heap_xrealloc(data, max_data_bytes); + data = realloc(data, max_data_bytes); } else { max_value_len *= 2; - value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); + value_name = realloc(value_name, max_value_len * sizeof(WCHAR)); } } else break; } - heap_free(data); - heap_free(value_name); + free(data); + free(value_name); - subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); + subkey_name = malloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); path_len = lstrlenW(path); @@ -298,13 +297,13 @@ static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) export_registry_data(hFile, subkey, subkey_path); RegCloseKey(subkey); } - heap_free(subkey_path); + free(subkey_path); i++; } else break; } - heap_free(subkey_name); + free(subkey_name); return 0; } diff --git a/programs/reg/import.c b/programs/reg/import.c index 13e54e6a69a..93d6d46aef9 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -18,7 +18,6 @@ #include <errno.h> #include <stdio.h> -#include <stdlib.h> #include "reg.h" #include <wine/debug.h> @@ -31,7 +30,7 @@ static WCHAR *GetWideString(const char *strA) WCHAR *strW; int len = MultiByteToWideChar(CP_ACP, 0, strA, -1, NULL, 0); - strW = heap_xalloc(len * sizeof(WCHAR)); + strW = malloc(len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, strA, -1, strW, len); return strW; } @@ -45,7 +44,7 @@ static WCHAR *GetWideStringN(const char *strA, int size, DWORD *len) WCHAR *strW; *len = MultiByteToWideChar(CP_ACP, 0, strA, size, NULL, 0); - strW = heap_xalloc(*len * sizeof(WCHAR)); + strW = malloc(*len * sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, strA, size, strW, *len); return strW; } @@ -192,7 +191,7 @@ static BOOL convert_hex_csv_to_hex(struct parser *parser, WCHAR **str) /* The worst case is 1 digit + 1 comma per byte */ size = ((lstrlenW(*str) + 1) / 2) + parser->data_size; - parser->data = heap_xrealloc(parser->data, size); + parser->data = realloc(parser->data, size); s = *str; d = (BYTE *)parser->data + parser->data_size; @@ -358,7 +357,7 @@ static void close_key(struct parser *parser) { if (parser->hkey) { - heap_free(parser->key_name); + free(parser->key_name); parser->key_name = NULL; RegCloseKey(parser->hkey); @@ -383,7 +382,7 @@ static LONG open_key(struct parser *parser, WCHAR *path) if (res == ERROR_SUCCESS) { - parser->key_name = heap_xalloc((lstrlenW(path) + 1) * sizeof(WCHAR)); + parser->key_name = malloc((lstrlenW(path) + 1) * sizeof(WCHAR)); lstrcpyW(parser->key_name, path); } else @@ -395,7 +394,7 @@ static LONG open_key(struct parser *parser, WCHAR *path) static void free_parser_data(struct parser *parser) { if (parser->parse_type == REG_DWORD || parser->parse_type == REG_BINARY) - heap_free(parser->data); + free(parser->data); parser->data = NULL; parser->data_size = 0; @@ -429,7 +428,7 @@ static void prepare_hex_string_data(struct parser *parser) parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); parser->data_size *= sizeof(WCHAR); - heap_free(data); + free(data); } } } @@ -482,12 +481,12 @@ static WCHAR *header_state(struct parser *parser, WCHAR *pos) if (!parser->is_unicode) { - header = heap_xalloc((lstrlenW(line) + 3) * sizeof(WCHAR)); + header = malloc((lstrlenW(line) + 3) * sizeof(WCHAR)); header[0] = parser->two_wchars[0]; header[1] = parser->two_wchars[1]; lstrcpyW(header + 2, line); parser->reg_version = parse_file_header(header); - heap_free(header); + free(header); } else parser->reg_version = parse_file_header(line); @@ -627,7 +626,7 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) /* handler for parser DEFAULT_VALUE_NAME state */ static WCHAR *default_value_name_state(struct parser *parser, WCHAR *pos) { - heap_free(parser->value_name); + free(parser->value_name); parser->value_name = NULL; set_state(parser, DATA_START); @@ -639,14 +638,14 @@ static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) { WCHAR *val_name = pos, *p; - heap_free(parser->value_name); + free(parser->value_name); parser->value_name = NULL; if (!unescape_string(val_name, &p)) goto invalid; /* copy the value name in case we need to parse multiple lines and the buffer is overwritten */ - parser->value_name = heap_xalloc((lstrlenW(val_name) + 1) * sizeof(WCHAR)); + parser->value_name = malloc((lstrlenW(val_name) + 1) * sizeof(WCHAR)); lstrcpyW(parser->value_name, val_name); set_state(parser, DATA_START); @@ -757,7 +756,7 @@ static WCHAR *dword_data_state(struct parser *parser, WCHAR *pos) { WCHAR *line = pos; - parser->data = heap_xalloc(sizeof(DWORD)); + parser->data = malloc(sizeof(DWORD)); if (!convert_hex_to_dword(line, parser->data)) goto invalid; @@ -879,14 +878,14 @@ static WCHAR *get_lineA(FILE *fp) static char *buf, *next; char *line; - heap_free(lineW); + free(lineW); if (!fp) goto cleanup; if (!size) { size = REG_VAL_BUF_SIZE; - buf = heap_xalloc(size); + buf = malloc(size); *buf = 0; next = buf; } @@ -903,7 +902,7 @@ static WCHAR *get_lineA(FILE *fp) if (size - len < 3) { size *= 2; - buf = heap_xrealloc(buf, size); + buf = realloc(buf, size); } if (!(count = fread(buf + len, 1, size - len - 1, fp))) { @@ -925,7 +924,7 @@ static WCHAR *get_lineA(FILE *fp) cleanup: lineW = NULL; - if (size) heap_free(buf); + free(buf); size = 0; return NULL; } @@ -941,7 +940,7 @@ static WCHAR *get_lineW(FILE *fp) if (!size) { size = REG_VAL_BUF_SIZE; - buf = heap_xalloc(size * sizeof(WCHAR)); + buf = malloc(size * sizeof(WCHAR)); *buf = 0; next = buf; } @@ -959,7 +958,7 @@ static WCHAR *get_lineW(FILE *fp) if (size - len < 3) { size *= 2; - buf = heap_xrealloc(buf, size * sizeof(WCHAR)); + buf = realloc(buf, size * sizeof(WCHAR)); } if (!(count = fread(buf + len, sizeof(WCHAR), size - len - 1, fp))) { @@ -978,7 +977,7 @@ static WCHAR *get_lineW(FILE *fp) } cleanup: - if (size) heap_free(buf); + free(buf); size = 0; return NULL; } @@ -1036,7 +1035,7 @@ int reg_import(int argc, WCHAR *argvW[]) if (parser.reg_version == REG_VERSION_INVALID) goto error; - heap_free(parser.value_name); + free(parser.value_name); close_key(&parser); fclose(fp); diff --git a/programs/reg/query.c b/programs/reg/query.c index b24edb2f0b2..6ab518c91d9 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -41,7 +41,7 @@ static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) { case REG_SZ: case REG_EXPAND_SZ: - buffer = heap_xalloc(size_bytes); + buffer = malloc(size_bytes); lstrcpyW(buffer, (WCHAR *)src); break; case REG_NONE: @@ -50,7 +50,7 @@ static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) WCHAR *ptr; static const WCHAR fmt[] = {'%','0','2','X',0}; - buffer = heap_xalloc((size_bytes * 2 + 1) * sizeof(WCHAR)); + buffer = malloc((size_bytes * 2 + 1) * sizeof(WCHAR)); ptr = buffer; for (i = 0; i < size_bytes; i++) ptr += swprintf(ptr, 3, fmt, src[i]); @@ -63,7 +63,7 @@ static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) const int zero_x_dword = 10; static const WCHAR fmt[] = {'0','x','%','x',0}; - buffer = heap_xalloc((zero_x_dword + 1) * sizeof(WCHAR)); + buffer = malloc((zero_x_dword + 1) * sizeof(WCHAR)); swprintf(buffer, zero_x_dword + 1, fmt, *(DWORD *)src); break; } @@ -76,13 +76,13 @@ static WCHAR *reg_data_to_wchar(DWORD type, const BYTE *src, DWORD size_bytes) if (size_bytes <= two_wchars) { - buffer = heap_xalloc(sizeof(WCHAR)); + buffer = malloc(sizeof(WCHAR)); *buffer = 0; return buffer; } tmp_size = size_bytes - two_wchars; /* exclude both null terminators */ - buffer = heap_xalloc(tmp_size * 2 + sizeof(WCHAR)); + buffer = malloc(tmp_size * 2 + sizeof(WCHAR)); len = tmp_size / sizeof(WCHAR); for (i = 0, destindex = 0; i < len; i++, destindex++) @@ -123,7 +123,7 @@ static void output_value(const WCHAR *value_name, DWORD type, BYTE *data, DWORD { reg_data = reg_data_to_wchar(type, data, data_size); output_string(fmt, reg_data); - heap_free(reg_data); + free(reg_data); } else { @@ -146,7 +146,7 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) WCHAR *subkey_name, *subkey_path; HKEY subkey; - data = heap_xalloc(max_data_bytes); + data = malloc(max_data_bytes); for (;;) { @@ -155,7 +155,7 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) if (rc == ERROR_MORE_DATA) { max_data_bytes = data_size; - data = heap_xrealloc(data, max_data_bytes); + data = realloc(data, max_data_bytes); } else break; } @@ -168,7 +168,7 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) num_values_found++; } - heap_free(data); + free(data); if (!recurse) { @@ -185,7 +185,7 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) return 0; } - subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); + subkey_name = malloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); path_len = lstrlenW(path); @@ -202,13 +202,13 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) query_value(subkey, value_name, subkey_path, recurse); RegCloseKey(subkey); } - heap_free(subkey_path); + free(subkey_path); i++; } else break; } - heap_free(subkey_name); + free(subkey_name); return 0; } @@ -227,8 +227,8 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) output_string(fmt, path); - value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); - data = heap_xalloc(max_data_bytes); + value_name = malloc(max_value_len * sizeof(WCHAR)); + data = malloc(max_data_bytes); i = 0; for (;;) @@ -246,24 +246,24 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) if (data_size > max_data_bytes) { max_data_bytes = data_size; - data = heap_xrealloc(data, max_data_bytes); + data = realloc(data, max_data_bytes); } else { max_value_len *= 2; - value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); + value_name = realloc(value_name, max_value_len * sizeof(WCHAR)); } } else break; } - heap_free(data); - heap_free(value_name); + free(data); + free(value_name); if (i || recurse) output_string(newlineW); - subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); + subkey_name = malloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); path_len = lstrlenW(path); @@ -282,7 +282,7 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) query_all(subkey, subkey_path, recurse); RegCloseKey(subkey); } - heap_free(subkey_path); + free(subkey_path); } else output_string(fmt_path, path, subkey_name); i++; @@ -290,7 +290,7 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) else break; } - heap_free(subkey_name); + free(subkey_name); if (i && !recurse) output_string(newlineW); diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 309d855e996..7b8dd1f37f5 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <stdlib.h> #include "reg.h" #include <wine/debug.h> @@ -69,30 +68,6 @@ const struct reg_type_rels type_rels[] = {REG_MULTI_SZ, type_multi_sz}, }; -void *heap_xalloc(size_t size) -{ - void *buf = heap_alloc(size); - if (!buf) - { - ERR("Out of memory!\n"); - exit(1); - } - return buf; -} - -void *heap_xrealloc(void *buf, size_t size) -{ - void *new_buf = heap_realloc(buf, size); - - if (!new_buf) - { - ERR("Out of memory!\n"); - exit(1); - } - - return new_buf; -} - void output_writeconsole(const WCHAR *str, DWORD wlen) { DWORD count, ret; @@ -108,11 +83,11 @@ void output_writeconsole(const WCHAR *str, DWORD wlen) * one in that case. */ len = WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, NULL, 0, NULL, NULL); - msgA = heap_xalloc(len); + msgA = malloc(len); WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); - heap_free(msgA); + free(msgA); } } @@ -233,7 +208,7 @@ WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD WCHAR *subkey_path; static const WCHAR fmt[] = {'%','s','\\','%','s',0}; - subkey_path = heap_xalloc((path_len + subkey_len + 2) * sizeof(WCHAR)); + subkey_path = malloc((path_len + subkey_len + 2) * sizeof(WCHAR)); swprintf(subkey_path, path_len + subkey_len + 2, fmt, path, subkey_name); return subkey_path; @@ -255,13 +230,13 @@ static WCHAR *get_long_key(HKEY root, WCHAR *path) if (!path) { - long_key = heap_xalloc((len + 1) * sizeof(WCHAR)); + long_key = malloc((len + 1) * sizeof(WCHAR)); lstrcpyW(long_key, root_rels[i].long_name); return long_key; } len += lstrlenW(path) + 1; /* add one for the backslash */ - long_key = heap_xalloc((len + 1) * sizeof(WCHAR)); + long_key = malloc((len + 1) * sizeof(WCHAR)); swprintf(long_key, len + 1, fmt, root_rels[i].long_name, path); return long_key; } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 83bcf516297..89492ae8f74 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -19,8 +19,8 @@ #ifndef __REG_H__ #define __REG_H__ +#include <stdlib.h> #include <windows.h> -#include <wine/heap.h> #include "resource.h" #define MAX_SUBKEY_LEN 257 @@ -33,8 +33,6 @@ struct reg_type_rels { extern const struct reg_type_rels type_rels[8]; -void *heap_xalloc(size_t size); -void *heap_xrealloc(void *buf, size_t size); void output_writeconsole(const WCHAR *str, DWORD wlen); void WINAPIV output_message(unsigned int id, ...); void WINAPIV output_string(const WCHAR *fmt, ...); -- 2.31.0

1 4

[PATCH 1/3] Implement a stub IMFGetService for the media source.
by Giovanni Mascellani 24 Mar '21

24 Mar '21

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 44 +++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 3260175f45a..ff1230555c9 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -78,6 +78,7 @@ struct source_async_command struct media_source { IMFMediaSource IMFMediaSource_iface; + IMFGetService IMFGetService_iface; IMFAsyncCallback async_commands_callback; LONG ref; DWORD async_commands_queue; @@ -113,6 +114,11 @@ static inline struct media_source *impl_from_IMFMediaSource(IMFMediaSource *ifac return CONTAINING_RECORD(iface, struct media_source, IMFMediaSource_iface); } +static inline struct media_source *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct media_source, IMFGetService_iface); +} + static inline struct media_source *impl_from_async_commands_callback_IMFAsyncCallback(IMFAsyncCallback *iface) { return CONTAINING_RECORD(iface, struct media_source, async_commands_callback); @@ -823,6 +829,39 @@ done: return hr; } +static HRESULT WINAPI media_source_get_service_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct media_source *source = impl_from_IMFGetService(iface); + return IMFMediaSource_QueryInterface(&source->IMFMediaSource_iface, riid, obj); +} + +static ULONG WINAPI media_source_get_service_AddRef(IMFGetService *iface) +{ + struct media_source *source = impl_from_IMFGetService(iface); + return IMFMediaSource_AddRef(&source->IMFMediaSource_iface); +} + +static ULONG WINAPI media_source_get_service_Release(IMFGetService *iface) +{ + struct media_source *source = impl_from_IMFGetService(iface); + return IMFMediaSource_Release(&source->IMFMediaSource_iface); +} + +static HRESULT WINAPI media_source_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + FIXME("stub %p, %s, %s, %p.\n", iface, debugstr_guid(service), debugstr_guid(riid), obj); + + return E_NOINTERFACE; +} + +static const IMFGetServiceVtbl media_source_get_service_vtbl = +{ + media_source_get_service_QueryInterface, + media_source_get_service_AddRef, + media_source_get_service_Release, + media_source_get_service_GetService, +}; + static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID riid, void **out) { struct media_source *source = impl_from_IMFMediaSource(iface); @@ -835,6 +874,10 @@ static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID { *out = &source->IMFMediaSource_iface; } + else if (IsEqualIID(riid, &IID_IMFGetService)) + { + *out = &source->IMFGetService_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -1094,6 +1137,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ return E_OUTOFMEMORY; object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; + object->IMFGetService_iface.lpVtbl = &media_source_get_service_vtbl; object->async_commands_callback.lpVtbl = &source_async_commands_callback_vtbl; object->ref = 1; object->byte_stream = bytestream; -- 2.31.0

2 3

[PATCH v2 1/4] include: Move SIGNER_* definitions to a new public header.
by Zebediah Figura 24 Mar '21

24 Mar '21

Thereby making it easier to use them from ntoskrnl, setupapi, and other modules. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mssign32/mssign32_main.c | 3 +-- dlls/mssign32/mssign32_private.h => include/wine/mssign.h | 0 2 files changed, 1 insertion(+), 2 deletions(-) rename dlls/mssign32/mssign32_private.h => include/wine/mssign.h (100%) diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index 86825bf0ec1..c76d467f3f4 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -26,8 +26,7 @@ #include "wine/debug.h" #include "wine/heap.h" - -#include "mssign32_private.h" +#include "wine/mssign.h" WINE_DEFAULT_DEBUG_CHANNEL(mssign); diff --git a/dlls/mssign32/mssign32_private.h b/include/wine/mssign.h similarity index 100% rename from dlls/mssign32/mssign32_private.h rename to include/wine/mssign.h -- 2.30.2

2 4

[PATCH 1/4] include: Move SIGNER_* definitions to a new public header.
by Zebediah Figura 24 Mar '21

24 Mar '21

Thereby making it easier to use them from ntoskrnl, setupapi, and other modules. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mssign32/mssign32_main.c | 3 +-- dlls/mssign32/mssign32_private.h => include/wine/mssign.h | 0 2 files changed, 1 insertion(+), 2 deletions(-) rename dlls/mssign32/mssign32_private.h => include/wine/mssign.h (100%) diff --git a/dlls/mssign32/mssign32_main.c b/dlls/mssign32/mssign32_main.c index 86825bf0ec1..c76d467f3f4 100644 --- a/dlls/mssign32/mssign32_main.c +++ b/dlls/mssign32/mssign32_main.c @@ -26,8 +26,7 @@ #include "wine/debug.h" #include "wine/heap.h" - -#include "mssign32_private.h" +#include "wine/mssign.h" WINE_DEFAULT_DEBUG_CHANNEL(mssign); diff --git a/dlls/mssign32/mssign32_private.h b/include/wine/mssign.h similarity index 100% rename from dlls/mssign32/mssign32_private.h rename to include/wine/mssign.h -- 2.30.2

2 6

[PATCH] shcore: Add names for stubs.
by Mark Harmstone 24 Mar '21

24 Mar '21

Names come from the S_PUB32 entries in Microsoft's published PDB files. Signed-off-by: Mark Harmstone <mark(a)harmstone.com> --- dlls/shcore/shcore.spec | 211 ++++++++++++++++++++++------------------ 1 file changed, 114 insertions(+), 97 deletions(-) diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 368fab19541..02d4c89940a 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -1,4 +1,4 @@ -1 stub @ +1 stub -noname SHCreateReadOnlySharedMemoryStream @ stdcall CommandLineToArgvW(wstr ptr) @ stub CreateRandomAccessStreamOnFile @ stub CreateRandomAccessStreamOverStream @@ -9,6 +9,8 @@ @ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) @ stdcall GetDpiForMonitor(long long ptr ptr) @ stub GetDpiForShellUIComponent +@ stub GetFeatureEnabledState +@ stub GetFeatureVariant @ stdcall GetProcessDpiAwareness(long ptr) @ stdcall GetProcessReference(ptr) @ stdcall GetScaleFactorForDevice(long) @@ -26,6 +28,10 @@ @ stdcall IUnknown_Set(ptr ptr) @ stdcall IUnknown_SetSite(ptr ptr) @ stdcall IsOS(long) +@ stub IsProcessInIsolatedContainer +@ stub IsProcessInWDAGContainer +@ stub RecordFeatureError +@ stub RecordFeatureUsage @ stub RegisterScaleChangeEvent @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications @@ -75,107 +81,118 @@ @ stdcall SHSetValueW(long wstr wstr long ptr long) @ stdcall SHStrDupA(str ptr) @ stdcall SHStrDupW(wstr ptr) +@ stub SHTaskPoolAllowThreadReuse +@ stub SHTaskPoolDoNotWaitForMoreTasks +@ stub SHTaskPoolGetCurrentThreadLifetime +@ stub SHTaskPoolGetUniqueContext +@ stub SHTaskPoolQueueTask +@ stub SHTaskPoolSetThreadReuseAllowed @ stdcall SHUnicodeToAnsi(wstr ptr ptr) @ stdcall SHUnicodeToUnicode(wstr ptr long) @ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) @ stdcall SetProcessDpiAwareness(long) @ stdcall SetProcessReference(ptr) +@ stub SubscribeFeatureStateChangeNotification @ stub UnregisterScaleChangeEvent +@ stub UnsubscribeFeatureStateChangeNotification -100 stub @ -101 stub @ -102 stub @ -103 stub @ -104 stub @ -105 stub @ -106 stub @ -107 stub @ -108 stub @ -109 stub @ -110 stub @ -111 stub @ -115 stub @ -116 stub @ -117 stub @ -120 stub @ -121 stub @ +100 stub -noname SHManagedCreateStreamOnFile +101 stub -noname SHManagedCreateFile +102 stub -noname SHIsEmptyStream +103 stub -noname MapWin32ErrorToSTG +104 stub -noname ModeToCreateFileFlags +105 stub -noname CreateTempStreamName +106 stub -noname StreamCopyTo +107 stub -noname IStream_ReadStrLong +108 stub -noname IStream_WriteStrLong +109 stub -noname SHCreateStreamOnModuleResourceW +110 stub -noname SHCreateStreamOnDllResourceW +111 stub -noname CreateWritableSharedMemoryStream +115 stub -noname CreateRandomAccessStreamOnFileWithOptions +116 stub -noname RandomAccessStreamCopyAsync +117 stub -noname CreateRandomAccessStreamOnPlaceholderFile +120 stub -noname SHRegGetCLSIDKey +121 stub -noname SHRegSetValue 122 stub SHRegGetValueFromHKCUHKLM -123 stub @ -124 stub @ -125 stub @ -126 stub @ -127 stub @ -130 stub @ -131 stub @ -132 stub @ -133 stub @ -140 stub @ -141 stub @ -142 stub @ -143 stub @ -144 stub @ -145 stub @ -150 stub @ -151 stub @ -152 stub @ -153 stub @ -160 stub @ -161 stub @ -162 stub @ -170 stub @ -171 stub @ -172 stub @ -173 stub @ -181 stub @ -182 stub @ -183 stub @ -184 stub @ -185 stub @ -186 stub @ -187 stub @ -188 stub @ -190 stub @ -191 stub @ -192 stub @ -193 stub @ -200 stub @ -220 stub @ -221 stub @ -222 stub @ -223 stub @ -224 stub @ -225 stub @ -226 stub @ -227 stub @ -228 stub @ -230 stub @ -231 stub @ -232 stub @ -233 stub @ -234 stub @ -240 stub @ -241 stub @ -242 stub @ -243 stub @ -244 stub @ -245 stub @ -246 stub @ -247 stub @ -248 stub @ -250 stub @ -251 stub @ -252 stub @ -253 stub @ -254 stub @ -255 stub @ -260 stub @ -261 stub @ -270 stub @ -280 stub @ -281 stub @ -282 stub @ -283 stub @ -284 stub @ -290 stub @ -291 stub @ -292 stub @ +123 stub -noname SHRegGetBoolValueFromHKCUHKLM +124 stub -noname SHGetValueGoodBootA +125 stub -noname SHGetValueGoodBootW +126 stub -noname SHLoadRegUIStringW +127 stub -noname QuerySourceCreateFromKeyEx +130 stub -noname SHGlobalCounterGetValue +131 stub -noname SHGlobalCounterIncrement +132 stub -noname SHGlobalCounterDecrement +133 stub -noname SHGlobalCounterSetValue +140 stub -noname IUnknown_ProfferService +141 stub -noname IUnknown_RemoveBackReferences +142 stub -noname IUnknown_GetClassID +143 stub -noname StrRetToStrW +144 stub -noname StrRetToBSTR +145 stub -noname StrRetToBufW +150 stub -noname SHAnsiToUnicodeCP +151 stub -noname SHUnicodeToAnsiCP +152 stub -noname SHUnicodeToAnsiCPAlloc +153 stub -noname SHAnsiToUnicodeCPAlloc +160 stub -noname SHWaitForSendMessageThread +161 stub -noname SHWaitForThreadWithWakeMask +162 stub -noname SHQueueUserWorkItem +170 stub -noname PathIsNetworkPathW +171 stub -noname PathIsNetworkPathA +172 stub -noname PathBuildRootW +173 stub -noname PathBuildRootA +174 stub -noname DriveType +175 stub -noname IsNetDrive +181 stub -noname SHMapHandle +182 stub -noname SHAllocShared +183 stub -noname SHLockSharedEx +184 stub -noname SHLockShared +185 stub -noname SHGetSizeShared +186 stub -noname SHUnlockShared +187 stub -noname SHFreeShared +188 stub -noname SHCreateWorkerWindowW +189 stub -noname SHCreateOplockProvider +190 stub -noname SHWindowsPolicy +191 stub -noname SHWindowsPolicyGetValue +192 stub -noname IsAppCompatModeEnabled +193 stub -noname SHGetObjectCompatFlags +200 stub -noname GUIDFromStringW +220 stub -noname GetPhysicalDpiForDevice +222 stub -noname ScaleRelativePixelsForDevice +223 stub -noname PhysicalRectFromScaledRect +224 stub -noname ScaleAndMapRelativeRectForDevice +225 stub -noname CanOverrideScaleFactor +226 stub -noname GetScalingOverride +227 stub -noname RegisterScaleChangeSink +228 stub -noname SetDesignModeScaleFactor +229 stub -noname GetProposedScaleFactorForWindow +230 stub -noname SHSetWindowSubclass +231 stub -noname SHGetWindowSubclassData +232 stub -noname SHRemoveWindowSubclass +233 stub -noname SHDefSubclassProc +234 stub -noname SHRegisterClassW +240 stub -noname RegisterScaleChangeSinkForWindow +241 stub -noname ScaleAndMapRelativeRect +242 stub -noname RelativeRectFromPhysicalRectWithScale +244 stub -noname GetScaleFactorForWindow +245 stub -noname RegisterScaleChangeNotificationsForWindow +246 stub -noname RevokeScaleChangeNotificationsForWindow +247 stub -noname GetOverrideScaleFactorForWindow +248 stub -noname GetSystemScaleFactorForWindow +249 stub -noname UpdateScalingInfoCache +250 stub -noname RegisterCurrentWindowChangeListener +251 stub -noname RegisterWindowMonitorChangeListener +252 stub -noname UnregisterCurrentWindowChangeListener +253 stub -noname UnregisterWindowMonitorChangeListener +254 stub -noname AddCurrentWindowCandidate +255 stub -noname GetCurrentWindow +260 stub -noname PhysicalRectFromRelativeRectWithScales +261 stub -noname RelativeRectFromPhysicalRectWithScales +270 stub -noname SHCreateMemoryStreamOnSharedBuffer +280 stub -noname _CreateDirectoryHelper +281 stub -noname Win32CreateDirectory +282 stub -noname SuspendSHNotify +283 stub -noname ResumeSHNotify +284 stub -noname IsNotifySuspended +290 stub -noname SHCreateDirectoryExW +291 stub -noname SHCreateDirectoryExA +292 stub -noname SHCreateDirectory -- 2.26.3

1 0