July 2016 - Wine-commits - list.winehq.org

Hans Leidekker : webservices: Implement WsWriteNode.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: b17b7b430c2f31beb79962aeeedfeb8a5fe9f216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b17b7b430c2f31beb79962aee… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 4 11:35:41 2016 +0200 webservices: Implement WsWriteNode. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 98 +++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 555 +++++++++++++++++++++++++------------- include/webservices.h | 1 + 4 files changed, 471 insertions(+), 185 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b17b7b430c2f31beb7996…

1 0

Hans Leidekker : webservices: Add support for UTF-16 text values in the writer.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 45824850a6d3d1189d78b0e7477836e8566fbff6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45824850a6d3d1189d78b0e74… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 4 11:35:42 2016 +0200 webservices: Add support for UTF-16 text values in the writer. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/writer.c | 305 ++++++++++++++++++++-------------------------- include/webservices.h | 6 + 2 files changed, 141 insertions(+), 170 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45824850a6d3d1189d78b…

1 0

Francois Gouget : exdisp.idl: Fix a typo in a method name.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 5880f5c55604363fdb6a521f304290ae3be58cd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5880f5c55604363fdb6a521f3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:57:24 2016 +0200 exdisp.idl: Fix a typo in a method name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/exdisp.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/exdisp.idl b/include/exdisp.idl index 5ee9960..b665ce3 100644 --- a/include/exdisp.idl +++ b/include/exdisp.idl @@ -486,7 +486,7 @@ dispinterface DWebBrowserEvents2 [in] BSTR bstrWorkerLabel); [id(DISPID_WEBWORKERFINISHED)] - void WebWorkerFinsihed([in] DWORD dwUniqueID); + void WebWorkerFinished([in] DWORD dwUniqueID); } [

1 0

Francois Gouget : ws2_32/tests: Fix a typo in a comment.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 29ae5f8e9b1b202d002a16e1f9e6f01bde47d99c URL: http://source.winehq.org/git/wine.git/?a=commit;h=29ae5f8e9b1b202d002a16e1f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:57:41 2016 +0200 ws2_32/tests: Fix a typo in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6853279..ed31f25 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2652,7 +2652,7 @@ static void test_WSADuplicateSocket(void) closesocket(source); /* create a socket, bind it, duplicate it then send data on source and - * receve in the duplicated socket */ + * receive in the duplicated socket */ source = WSASocketA(AF_INET, SOCK_DGRAM, IPPROTO_UDP, NULL, 0, 0); ok(source != INVALID_SOCKET, "WSASocketA should have succeeded\n");

1 0

Francois Gouget : ntdll: Fix typos in some comments.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 75c1622b01321df9b5016ec1f5b0505cce9e94dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c1622b01321df9b5016ec1f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:57:56 2016 +0200 ntdll: Fix typos in some comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 8af2181..0d03300 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -1209,7 +1209,7 @@ static NTSTATUS RTL_GetKeyHandle(ULONG RelativeTo, PCWSTR Path, PHANDLE handle) /************************************************************************* * RtlQueryRegistryValues [NTDLL.@] * - * Query multiple registry values with a signle call. + * Query multiple registry values with a single call. * * PARAMS * RelativeTo [I] Registry path that Path refers to @@ -1386,7 +1386,7 @@ out: /************************************************************************* * RtlCheckRegistryKey [NTDLL.@] * - * Query multiple registry values with a signle call. + * Query multiple registry values with a single call. * * PARAMS * RelativeTo [I] Registry path that Path refers to @@ -1416,7 +1416,7 @@ NTSTATUS WINAPI RtlCheckRegistryKey(IN ULONG RelativeTo, IN PWSTR Path) /************************************************************************* * RtlDeleteRegistryValue [NTDLL.@] * - * Query multiple registry values with a signle call. + * Query multiple registry values with a single call. * * PARAMS * RelativeTo [I] Registry path that Path refers to

1 0

Francois Gouget : mfdrv: Fix a typo in a comment.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: d7e18f6540244cc730e8f9dbbbc737ad6d0eda12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e18f6540244cc730e8f9dbb… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:58:33 2016 +0200 mfdrv: Fix a typo in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/mfdrv/bitblt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/mfdrv/bitblt.c b/dlls/gdi32/mfdrv/bitblt.c index fd6c68f..9bf7ab5 100644 --- a/dlls/gdi32/mfdrv/bitblt.c +++ b/dlls/gdi32/mfdrv/bitblt.c @@ -161,7 +161,7 @@ INT MFDRV_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, /*********************************************************************** - * MFDRV_SetDIBitsToDeivce + * MFDRV_SetDIBitsToDevice */ INT MFDRV_SetDIBitsToDevice( PHYSDEV dev, INT xDst, INT yDst, DWORD cx, DWORD cy, INT xSrc, INT ySrc, UINT startscan,

1 0

Francois Gouget : regedit: Make get_token() static.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 5da8ad93a03ca70d18015f389921699443d56285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da8ad93a03ca70d18015f389… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:59:09 2016 +0200 regedit: Make get_token() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 201eb4f..cbe3616 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -139,7 +139,7 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, char **argv, int *i) return TRUE; } -char *get_token(char *input, char **next) +static char *get_token(char *input, char **next) { char *ch = input; char *str;

1 0

Francois Gouget : kernel32: Fix typos in a couple of comments.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: c8d1fbc6d2170d935301e7c54244af5ab873c7ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d1fbc6d2170d935301e7c54… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 12:00:39 2016 +0200 kernel32: Fix typos in a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 2 +- dlls/kernel32/volume.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 39769ff..fefa373 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -915,7 +915,7 @@ void LOCALE_InitRegistry(void) /*********************************************************************** * get_mac_locale * - * Return a locale identifer string reflecting the Mac locale, in a form + * Return a locale identifier string reflecting the Mac locale, in a form * that parse_locale_name() will understand. So, strip out unusual * things like script, variant, etc. Or, rather, just construct it as * <lang>[_<country>].UTF-8. diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 4f01c99..68cc762 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -416,7 +416,7 @@ static enum fs_type VOLUME_ReadCDSuperblock( HANDLE handle, BYTE *buff ) /* Check UDF first as UDF and ISO9660 structures can coexist on the same medium * Starting from sector 16, we may find : * - a CD-ROM Volume Descriptor Set (ISO9660) containing one or more Volume Descriptors - * - an Extented Area (UDF) -- [E] 2/8.3.1 and [U] 2.1.7 + * - an Extended Area (UDF) -- [E] 2/8.3.1 and [U] 2.1.7 * There is no explicit end so read 16 sectors and then give up */ for( i=16; i<16+16; i++) {

1 0

Michael Stefaniuc : winemine: Use SetRect() instead of open coding it.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 925217b8578472f66d70480d167e15049f670f05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=925217b8578472f66d70480d1… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 10:53:46 2016 +0200 winemine: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/main.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 706e208..71ff75e 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -313,10 +313,8 @@ static void CreateBoard( BOARD *p_board ) p_board->face_bmp = SMILE_BMP; p_board->time = 0; - wnd_rect.left = p_board->pos.x; - wnd_rect.right = p_board->pos.x + p_board->width; - wnd_rect.top = p_board->pos.y; - wnd_rect.bottom = p_board->pos.y + p_board->height; + SetRect(&wnd_rect, p_board->pos.x, p_board->pos.y, p_board->pos.x + p_board->width, + p_board->pos.y + p_board->height); AdjustWindowRect(&wnd_rect, wnd_style, TRUE); /* Make sure the window is completely on the screen */

1 0

Michael Stefaniuc : wordpad: Use SetRect() instead of open coding it.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 8e05ddb1f89f81803993d3d0e2b113979318f842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e05ddb1f89f81803993d3d0e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 30 10:54:38 2016 +0200 wordpad: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wordpad/print.c | 46 ++++++++++++--------------------------------- programs/wordpad/registry.c | 7 +------ 2 files changed, 13 insertions(+), 40 deletions(-) diff --git a/programs/wordpad/print.c b/programs/wordpad/print.c index b3ee579..3b78ffa 100644 --- a/programs/wordpad/print.c +++ b/programs/wordpad/print.c @@ -88,12 +88,7 @@ void registry_read_pagemargins(HKEY hKey) if(!hKey || RegQueryValueExW(hKey, var_pagemargin, 0, NULL, (LPBYTE)&margins, &size) != ERROR_SUCCESS || size != sizeof(RECT)) - { - margins.top = 1417; - margins.bottom = 1417; - margins.left = 1757; - margins.right = 1757; - } + SetRect(&margins, 1757, 1417, 1757, 1417); } void registry_set_previewpages(HKEY hKey) @@ -201,10 +196,7 @@ static RECT get_print_rect(HDC hdc) height = centmm_to_twips(27000); } - rc.left = margins.left; - rc.right = width - margins.right; - rc.top = margins.top; - rc.bottom = height - margins.bottom; + SetRect(&rc, margins.left, margins.top, width - margins.right, height - margins.bottom); return rc; } @@ -452,10 +444,7 @@ static void print(LPPRINTDLGW pd, LPWSTR wszFileName) fr.hdcTarget = pd->hDC; fr.rc = get_print_rect(fr.hdc); - fr.rcPage.left = 0; - fr.rcPage.right = fr.rc.right + margins.right; - fr.rcPage.top = 0; - fr.rcPage.bottom = fr.rc.bottom + margins.bottom; + SetRect(&fr.rcPage, 0, 0, fr.rc.right + margins.right, fr.rc.bottom + margins.bottom); ZeroMemory(&di, sizeof(di)); di.cbSize = sizeof(di); @@ -512,19 +501,15 @@ void dialog_printsetup(HWND hMainWnd) ps.lStructSize = sizeof(ps); ps.hwndOwner = hMainWnd; ps.Flags = PSD_INHUNDREDTHSOFMILLIMETERS | PSD_MARGINS; - ps.rtMargin.left = twips_to_centmm(margins.left); - ps.rtMargin.right = twips_to_centmm(margins.right); - ps.rtMargin.top = twips_to_centmm(margins.top); - ps.rtMargin.bottom = twips_to_centmm(margins.bottom); + SetRect(&ps.rtMargin, twips_to_centmm(margins.left), twips_to_centmm(margins.top), + twips_to_centmm(margins.right), twips_to_centmm(margins.bottom)); ps.hDevMode = devMode; ps.hDevNames = devNames; if(PageSetupDlgW(&ps)) { - margins.left = centmm_to_twips(ps.rtMargin.left); - margins.right = centmm_to_twips(ps.rtMargin.right); - margins.top = centmm_to_twips(ps.rtMargin.top); - margins.bottom = centmm_to_twips(ps.rtMargin.bottom); + SetRect(&margins, centmm_to_twips(ps.rtMargin.left), centmm_to_twips(ps.rtMargin.top), + centmm_to_twips(ps.rtMargin.right), centmm_to_twips(ps.rtMargin.bottom)); devMode = ps.hDevMode; devNames = ps.hDevNames; update_ruler(get_ruler_wnd(hMainWnd)); @@ -713,10 +698,8 @@ static void draw_margin_lines(HDC hdc, int x, int y, float ratio) dpi.cx = GetDeviceCaps(hdc, LOGPIXELSX); dpi.cy = GetDeviceCaps(hdc, LOGPIXELSY); - page_margin.left = preview.rcPage.left + margins.left; - page_margin.top = preview.rcPage.top + margins.top; - page_margin.bottom = preview.rcPage.bottom - margins.bottom; - page_margin.right = preview.rcPage.right - margins.right; + SetRect(&page_margin, preview.rcPage.left + margins.left, preview.rcPage.top + margins.top, + preview.rcPage.right - margins.right, preview.rcPage.bottom - margins.bottom); page_margin.left = (int)((float)twips_to_pixels(page_margin.left, dpi.cx) * ratio); page_margin.top = (int)((float)twips_to_pixels(page_margin.top, dpi.cy) * ratio); @@ -860,10 +843,8 @@ static LRESULT print_preview(HWND hwndPreview) /* draw page outlines */ hPen = CreatePen(PS_SOLID|PS_INSIDEFRAME, 2, RGB(0,0,0)); oldPen = SelectObject(hdc, hPen); - background.left = x - 2; - background.right = x + preview.bmScaledSize.cx + 2; - background.top = y - 2; - background.bottom = y + preview.bmScaledSize.cy + 2; + SetRect(&background, x - 2, y - 2, x + preview.bmScaledSize.cx + 2, + y + preview.bmScaledSize.cy + 2); Rectangle(hdc, background.left, background.top, background.right, background.bottom); excl_rgn = CreateRectRgnIndirect(&background); @@ -956,10 +937,7 @@ static void update_preview(HWND hMainWnd) fr.chrg.cpMin = 0; fr.chrg.cpMax = preview.textlength; - paper.left = 0; - paper.right = preview.bmSize.cx; - paper.top = 0; - paper.bottom = preview.bmSize.cy; + SetRect(&paper, 0, 0, preview.bmSize.cx, preview.bmSize.cy); if (!preview.hdc) { preview.hdc = CreateCompatibleDC(hdc); diff --git a/programs/wordpad/registry.c b/programs/wordpad/registry.c index d53b747..6f7f14b 100644 --- a/programs/wordpad/registry.c +++ b/programs/wordpad/registry.c @@ -114,12 +114,7 @@ void registry_read_winrect(RECT* rc) if(registry_get_handle(&hKey, 0, key_options) != ERROR_SUCCESS || RegQueryValueExW(hKey, var_framerect, 0, NULL, (LPBYTE)rc, &size) != ERROR_SUCCESS || size != sizeof(RECT)) - { - rc->top = 0; - rc->left = 0; - rc->bottom = 300; - rc->right = 600; - } + SetRect(rc, 0, 0, 600, 300); RegCloseKey(hKey); }

1 0