system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 00:54:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

oledlg: Build with msvcrt.

Browse source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-06-18 09:00:11 +02:00
parent ff91ac6403
commit 815ae120fb
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dlls/oledlg/Makefile.in
View file

@ -2,6 +2,8 @@ MODULE = oledlg.dll
IMPORTLIB = oledlg
IMPORTS = ole32 comdlg32 user32 advapi32
EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
insobjdlg.c \
oledlg_main.c \

1
dlls/oledlg/insobjdlg.c
View file

@ -29,7 +29,6 @@
#include "wingdi.h"
#include "winuser.h"
#include "wine/debug.h"
#include "wine/unicode.h"
#include "oledlg.h"
#include "resource.h"

1
dlls/oledlg/oledlg_main.c
View file

@ -33,7 +33,6 @@
#include "resource.h"
#include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);

9
dlls/oledlg/pastespl.c
View file

@ -35,7 +35,6 @@
#include "resource.h"
#include "wine/debug.h"
#include "wine/unicode.h"
WINE_DEFAULT_DEBUG_CHANNEL(ole);
@ -432,15 +431,15 @@ static void update_result_text(HWND hdlg, const ps_struct_t *ps_struct)
}
LoadStringW(OLEDLG_hInstance, res_id, resource_txt, ARRAY_SIZE(resource_txt));
if((ptr = strstrW(resource_txt, percent_s)))
if((ptr = wcsstr(resource_txt, percent_s)))
{
/* FIXME handle %s in ResultText. Sub appname if IDS_PS_PASTE_OBJECT{_AS_ICON}. Else sub appropriate type name */
size_t result_txt_len = strlenW(pent->lpstrResultText);
size_t result_txt_len = lstrlenW(pent->lpstrResultText);
ptrdiff_t offs = (char*)ptr - (char*)resource_txt;
result_txt = HeapAlloc(GetProcessHeap(), 0, (strlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR));
result_txt = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(resource_txt) + result_txt_len - 1) * sizeof(WCHAR));
memcpy(result_txt, resource_txt, offs);
memcpy((char*)result_txt + offs, pent->lpstrResultText, result_txt_len * sizeof(WCHAR));
memcpy((char*)result_txt + offs + result_txt_len * sizeof(WCHAR), ptr + 2, (strlenW(ptr + 2) + 1) * sizeof(WCHAR));
memcpy((char*)result_txt + offs + result_txt_len * sizeof(WCHAR), ptr + 2, (lstrlenW(ptr + 2) + 1) * sizeof(WCHAR));
}
else
result_txt = resource_txt;