wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Alexandre Julliard : gdi32: Add a structure to store all the extra information needed for a pattern brush .
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 8bf48557ef7ed0191e1bbd4a495a6fefc2457d3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bf48557ef7ed0191e1bbd4a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 16:17:44 2011 +0100 gdi32: Add a structure to store all the extra information needed for a pattern brush. --- dlls/gdi32/brush.c | 142 ++++++++++++++++++++++++---------------------- dlls/gdi32/gdi_private.h | 10 +++ 2 files changed, 85 insertions(+), 67 deletions(-) diff --git a/dlls/gdi32/brush.c b/dlls/gdi32/brush.c index 384ef12..5dc7dfe 100644 --- a/dlls/gdi32/brush.c +++ b/dlls/gdi32/brush.c @@ -36,10 +36,7 @@ typedef struct { GDIOBJHDR header; LOGBRUSH logbrush; - HBITMAP bitmap; /* bitmap handle for DDB pattern brushes */ - BITMAPINFO *info; /* DIB info for pattern brushes */ - struct gdi_image_bits bits; /* DIB bits for pattern brushes */ - UINT usage; /* color usage for DIB info */ + struct brush_pattern pattern; } BRUSHOBJ; #define NB_HATCH_STYLES 6 @@ -58,8 +55,8 @@ static const struct gdi_obj_funcs brush_funcs = }; -/* fetch the contents of the brush bitmap and cache them in the brush object */ -static BOOL store_bitmap_bits( BRUSHOBJ *brush, BITMAPOBJ *bmp ) +/* fetch the contents of the brush bitmap and cache them in the brush pattern */ +static BOOL store_bitmap_bits( struct brush_pattern *brush, BITMAPOBJ *bmp ) { const struct gdi_dc_funcs *funcs = get_bitmap_funcs( bmp ); struct gdi_image_bits bits; @@ -88,7 +85,7 @@ static BOOL store_bitmap_bits( BRUSHOBJ *brush, BITMAPOBJ *bmp ) return TRUE; } -static BOOL copy_bitmap( BRUSHOBJ *brush, HBITMAP bitmap ) +static BOOL copy_bitmap( struct brush_pattern *brush, HBITMAP bitmap ) { BITMAPINFO *info; BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); @@ -140,6 +137,58 @@ done: return brush->info != NULL; } +BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) +{ + HGLOBAL hmem = 0; + + pattern->bitmap = 0; + pattern->info = NULL; + pattern->bits.free = NULL; + + switch (brush->lbStyle) + { + case BS_SOLID: + case BS_HOLLOW: + case BS_HATCHED: + return TRUE; + + case BS_PATTERN8X8: + brush->lbStyle = BS_PATTERN; + /* fall through */ + case BS_PATTERN: + brush->lbColor = 0; + return copy_bitmap( pattern, (HBITMAP)brush->lbHatch ); + + case BS_DIBPATTERN: + hmem = (HGLOBAL)brush->lbHatch; + if (!(brush->lbHatch = (ULONG_PTR)GlobalLock( hmem ))) return FALSE; + /* fall through */ + case BS_DIBPATTERNPT: + pattern->usage = brush->lbColor; + pattern->info = copy_packed_dib( (BITMAPINFO *)brush->lbHatch, pattern->usage ); + if (hmem) GlobalUnlock( hmem ); + if (!pattern->info) return FALSE; + pattern->bits.ptr = (char *)pattern->info + get_dib_info_size( pattern->info, pattern->usage ); + brush->lbStyle = BS_DIBPATTERN; + brush->lbColor = 0; + return TRUE; + + case BS_DIBPATTERN8X8: + case BS_MONOPATTERN: + case BS_INDEXED: + default: + WARN( "invalid brush style %u\n", brush->lbStyle ); + return FALSE; + } +} + +void free_brush_pattern( struct brush_pattern *pattern ) +{ + if (pattern->bits.free) pattern->bits.free( &pattern->bits ); + if (pattern->bitmap) DeleteObject( pattern->bitmap ); + HeapFree( GetProcessHeap(), 0, pattern->info ); +} + BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) { BRUSHOBJ *brush; @@ -147,23 +196,23 @@ BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT * if (!(brush = GDI_GetObjPtr( handle, OBJ_BRUSH ))) return FALSE; - if (!brush->info) + if (!brush->pattern.info) { - BITMAPOBJ *bmp = GDI_GetObjPtr( brush->bitmap, OBJ_BITMAP ); + BITMAPOBJ *bmp = GDI_GetObjPtr( brush->pattern.bitmap, OBJ_BITMAP ); if (bmp) { - store_bitmap_bits( brush, bmp ); - GDI_ReleaseObj( brush->bitmap ); + store_bitmap_bits( &brush->pattern, bmp ); + GDI_ReleaseObj( brush->pattern.bitmap ); } } - if (brush->info) + if (brush->pattern.info) { - memcpy( info, brush->info, get_dib_info_size( brush->info, brush->usage )); + memcpy( info, brush->pattern.info, get_dib_info_size( brush->pattern.info, brush->pattern.usage )); if (info->bmiHeader.biBitCount <= 8 && !info->bmiHeader.biClrUsed) fill_default_color_table( info ); - *bits = brush->bits.ptr; - *usage = brush->usage; + *bits = brush->pattern.bits.ptr; + *usage = brush->pattern.usage; ret = TRUE; } GDI_ReleaseObj( handle ); @@ -194,58 +243,19 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush ) { BRUSHOBJ * ptr; HBRUSH hbrush; - HGLOBAL hmem = 0; - if (!(ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*ptr) ))) return 0; + if (!(ptr = HeapAlloc( GetProcessHeap(), 0, sizeof(*ptr) ))) return 0; ptr->logbrush = *brush; - switch (ptr->logbrush.lbStyle) - { - case BS_SOLID: - case BS_HOLLOW: - case BS_HATCHED: - break; - - case BS_PATTERN8X8: - ptr->logbrush.lbStyle = BS_PATTERN; - /* fall through */ - case BS_PATTERN: - if (!copy_bitmap( ptr, (HBITMAP)ptr->logbrush.lbHatch )) goto error; - ptr->logbrush.lbColor = 0; - break; - - case BS_DIBPATTERN: - hmem = (HGLOBAL)ptr->logbrush.lbHatch; - if (!(ptr->logbrush.lbHatch = (ULONG_PTR)GlobalLock( hmem ))) goto error; - /* fall through */ - case BS_DIBPATTERNPT: - ptr->usage = ptr->logbrush.lbColor; - ptr->info = copy_packed_dib( (BITMAPINFO *)ptr->logbrush.lbHatch, ptr->usage ); - if (hmem) GlobalUnlock( hmem ); - if (!ptr->info) goto error; - ptr->bits.ptr = (char *)ptr->info + get_dib_info_size( ptr->info, ptr->usage ); - ptr->logbrush.lbStyle = BS_DIBPATTERN; - ptr->logbrush.lbColor = 0; - break; - - case BS_DIBPATTERN8X8: - case BS_MONOPATTERN: - case BS_INDEXED: - default: - WARN( "invalid brush style %u\n", ptr->logbrush.lbStyle ); - goto error; - } - - if ((hbrush = alloc_gdi_handle( &ptr->header, OBJ_BRUSH, &brush_funcs ))) + if (store_brush_pattern( &ptr->logbrush, &ptr->pattern ) && + (hbrush = alloc_gdi_handle( &ptr->header, OBJ_BRUSH, &brush_funcs ))) { TRACE("%p\n", hbrush); return hbrush; } - error: - if (ptr->bitmap) DeleteObject( ptr->bitmap ); - HeapFree( GetProcessHeap(), 0, ptr->info ); + free_brush_pattern( &ptr->pattern ); HeapFree( GetProcessHeap(), 0, ptr ); return 0; } @@ -476,22 +486,22 @@ static HGDIOBJ BRUSH_SelectObject( HGDIOBJ handle, HDC hdc ) if ((brush = GDI_GetObjPtr( handle, OBJ_BRUSH ))) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSelectBrush ); - HBITMAP bitmap = brush->bitmap; + HBITMAP bitmap = brush->pattern.bitmap; BITMAPINFO *info; void *bits; UINT usage; - if (bitmap && !brush->info) + if (bitmap && !brush->pattern.info) { BITMAPOBJ *bmp = GDI_GetObjPtr( bitmap, OBJ_BITMAP ); /* fetch the bitmap bits if we are selecting into a different type of DC */ - if (bmp && bmp->funcs != physdev->funcs) store_bitmap_bits( brush, bmp ); + if (bmp && bmp->funcs != physdev->funcs) store_bitmap_bits( &brush->pattern, bmp ); GDI_ReleaseObj( bitmap ); } - info = brush->info; - bits = brush->bits.ptr; - usage = brush->usage; + info = brush->pattern.info; + bits = brush->pattern.bits.ptr; + usage = brush->pattern.usage; GDI_inc_ref_count( handle ); GDI_ReleaseObj( handle ); @@ -519,9 +529,7 @@ static BOOL BRUSH_DeleteObject( HGDIOBJ handle ) BRUSHOBJ *brush = free_gdi_handle( handle ); if (!brush) return FALSE; - if (brush->bits.free) brush->bits.free( &brush->bits ); - if (brush->bitmap) DeleteObject( brush->bitmap ); - HeapFree( GetProcessHeap(), 0, brush->info ); + free_brush_pattern( &brush->pattern ); return HeapFree( GetProcessHeap(), 0, brush ); } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index c9822fe..daf3447 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -182,6 +182,14 @@ typedef struct tagBITMAPOBJ RGBQUAD *color_table; /* DIB color table if <= 8bpp (always 1 << bpp in size) */ } BITMAPOBJ; +struct brush_pattern +{ + HBITMAP bitmap; /* bitmap handle for DDB patterns */ + BITMAPINFO *info; /* DIB info */ + struct gdi_image_bits bits; /* DIB bits */ + UINT usage; /* color usage for DIB info */ +}; + /* bidi.c */ /* Wine_GCPW Flags */ @@ -208,6 +216,8 @@ extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; /* brush.c */ +extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN; +extern void free_brush_pattern( struct brush_pattern *pattern ) DECLSPEC_HIDDEN; extern BOOL get_brush_bitmap_info( HBRUSH handle, BITMAPINFO *info, void **bits, UINT *usage ) DECLSPEC_HIDDEN; /* clipping.c */

1 0

Alexandre Julliard : gdi32/tests: Get rid of Win9x compatibility in the pen tests.
by Alexandre Julliard 30 Dec '11

30 Dec '11

Module: wine Branch: master Commit: 5a67227078f6694c591526a6b3405f97e22b6d08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a67227078f6694c591526a6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 29 12:41:35 2011 +0100 gdi32/tests: Get rid of Win9x compatibility in the pen tests. --- dlls/gdi32/tests/pen.c | 50 ++++++++++------------------------------------- 1 files changed, 11 insertions(+), 39 deletions(-) diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c index 3a198a1..9b62669 100644 --- a/dlls/gdi32/tests/pen.c +++ b/dlls/gdi32/tests/pen.c @@ -98,19 +98,9 @@ static void test_logpen(void) size = GetObject(hpen, sizeof(lp), &lp); ok(size == sizeof(lp), "GetObject returned %d, error %d\n", size, GetLastError()); - if (pen[i].style == PS_USERSTYLE || pen[i].style == PS_ALTERNATE) - { - if (lp.lopnStyle == pen[i].style) - { - win_skip("Skipping PS_USERSTYLE and PS_ALTERNATE tests on Win9x\n"); - continue; - } - } ok(lp.lopnStyle == pen[i].ret_style, "expected %u, got %u\n", pen[i].ret_style, lp.lopnStyle); ok(lp.lopnWidth.x == pen[i].ret_width, "expected %u, got %d\n", pen[i].ret_width, lp.lopnWidth.x); - ok(lp.lopnWidth.y == 0 || - broken(lp.lopnWidth.y == 0xb), /* Win9x */ - "expected 0, got %d\n", lp.lopnWidth.y); + ok(lp.lopnWidth.y == 0, "expected 0, got %d\n", lp.lopnWidth.y); ok(lp.lopnColor == pen[i].ret_color, "expected %08x, got %08x\n", pen[i].ret_color, lp.lopnColor); DeleteObject(hpen); @@ -131,9 +121,7 @@ static void test_logpen(void) memset(&lp, 0xb0, sizeof(lp)); SetLastError(0xdeadbeef); size = GetObject(hpen, sizeof(lp.lopnStyle), &lp); - ok(!size || - broken(size == sizeof(lp.lopnStyle)), /* Win9x */ - "GetObject should fail: size %d, error %d\n", size, GetLastError()); + ok(!size, "GetObject should fail: size %d, error %d\n", size, GetLastError()); /* see how larger buffer sizes are handled */ memset(&lp, 0xb0, sizeof(lp)); @@ -251,17 +239,12 @@ static void test_logpen(void) break; case PS_USERSTYLE: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry) + sizeof(user_style) || - broken(size == 0 && GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ + ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry[2] ), "GetObject returned %d, error %d\n", size, GetLastError()); break; default: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry) || - broken(size == sizeof(LOGPEN)) || /* Win9x */ - broken(pen[i].style == PS_ALTERNATE && - size == 0 && - GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ + ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), "GetObject returned %d, error %d\n", size, GetLastError()); break; } @@ -270,9 +253,7 @@ static void test_logpen(void) memset(&elp, 0xb0, sizeof(elp)); SetLastError(0xdeadbeef); size = GetObject(hpen, sizeof(elp.elpPenStyle), &elp); - ok(!size || - broken(size == sizeof(elp.elpPenStyle)), /* Win9x */ - "GetObject should fail: size %d, error %d\n", size, GetLastError()); + ok(!size, "GetObject should fail: size %d, error %d\n", size, GetLastError()); /* see how larger buffer sizes are handled */ memset(elp_buffer, 0xb0, sizeof(elp_buffer)); @@ -301,7 +282,7 @@ static void test_logpen(void) break; case PS_USERSTYLE: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry) + sizeof(user_style), + ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry[2] ), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 2, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -310,11 +291,7 @@ static void test_logpen(void) break; default: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry) || - broken(size == sizeof(LOGPEN)) || /* Win9x */ - broken(pen[i].style == PS_ALTERNATE && - size == 0 && - GetLastError() == ERROR_INVALID_PARAMETER), /* Win9x */ + ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 0, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -372,12 +349,12 @@ test_geometric_pens: break; case PS_USERSTYLE: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry) + sizeof(user_style), + ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry[2] ), "GetObject returned %d, error %d\n", size, GetLastError()); break; default: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry), + ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), "GetObject returned %d, error %d\n", size, GetLastError()); break; } @@ -432,7 +409,7 @@ test_geometric_pens: ok(!size /*&& GetLastError() == ERROR_INVALID_PARAMETER*/, "GetObject should fail: size %d, error %d\n", size, GetLastError()); size = GetObject(hpen, sizeof(elp_buffer), elp_buffer); - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry) + sizeof(user_style), + ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry[2] ), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 2, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -441,7 +418,7 @@ test_geometric_pens: break; default: - ok(size == sizeof(EXTLOGPEN) - sizeof(elp.elpStyleEntry), + ok(size == FIELD_OFFSET( EXTLOGPEN, elpStyleEntry ), "GetObject returned %d, error %d\n", size, GetLastError()); ok(ext_pen->elpHatch == HS_CROSS, "expected HS_CROSS, got %p\n", (void *)ext_pen->elpHatch); ok(ext_pen->elpNumEntries == 0, "expected 0, got %x\n", ext_pen->elpNumEntries); @@ -547,11 +524,6 @@ static void test_ps_userstyle(void) pen = ExtCreatePen(PS_GEOMETRIC | PS_USERSTYLE, 50, &lb, 3, NULL); ok(pen == 0, "ExtCreatePen should fail\n"); - if (pen == 0 && GetLastError() == 0xdeadbeef) - { - win_skip("Looks like 9x, skipping PS_USERSTYLE tests\n"); - return; - } expect(ERROR_INVALID_PARAMETER, GetLastError()); DeleteObject(pen); SetLastError(0xdeadbeef);

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: eaa8801d16b135b0cee14d0f5bd7f0909a1a7c18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaa8801d16b135b0cee14d0f5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 29 17:19:43 2011 +0100 po: Update German translation. --- po/de.po | 145 ++++++++++++++++++++++++++++++------------------------------- 1 files changed, 71 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eaa8801d16b135b0cee14…

1 0

André Hentschel : cscript: Add forwarder to wscript.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 07ed25c2f038ec9e1b09e8a24a0a291047cc5079 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07ed25c2f038ec9e1b09e8a24… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Dec 28 16:08:26 2011 +0100 cscript: Add forwarder to wscript. --- configure | 1 + configure.ac | 1 + programs/cscript/Makefile.in | 8 +++++ programs/cscript/main.c | 61 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 804487f..bcc8105 100755 --- a/configure +++ b/configure @@ -15430,6 +15430,7 @@ wine_fn_config_program clock enable_clock install,po wine_fn_config_program cmd enable_cmd install,po wine_fn_config_test programs/cmd/tests cmd.exe_test wine_fn_config_program control enable_control install +wine_fn_config_program cscript enable_cscript install wine_fn_config_program dxdiag enable_dxdiag install,po wine_fn_config_program eject enable_eject install wine_fn_config_program expand enable_expand install diff --git a/configure.ac b/configure.ac index 1a7b56f..279339c 100644 --- a/configure.ac +++ b/configure.ac @@ -2939,6 +2939,7 @@ WINE_CONFIG_PROGRAM(clock,,[install,po]) WINE_CONFIG_PROGRAM(cmd,,[install,po]) WINE_CONFIG_TEST(programs/cmd/tests) WINE_CONFIG_PROGRAM(control,,[install]) +WINE_CONFIG_PROGRAM(cscript,,[install]) WINE_CONFIG_PROGRAM(dxdiag,,[install,po]) WINE_CONFIG_PROGRAM(eject,,[install]) WINE_CONFIG_PROGRAM(expand,,[install]) diff --git a/programs/cscript/Makefile.in b/programs/cscript/Makefile.in new file mode 100644 index 0000000..b738a30 --- /dev/null +++ b/programs/cscript/Makefile.in @@ -0,0 +1,8 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +MODULE = cscript.exe +APPMODE = -mwindows -municode + +C_SRCS = \ + main.c + +@MAKE_PROG_RULES@ diff --git a/programs/cscript/main.c b/programs/cscript/main.c new file mode 100644 index 0000000..f326260 --- /dev/null +++ b/programs/cscript/main.c @@ -0,0 +1,61 @@ +/* + * CSCRIPT Implementation + * + * Copyright 2011 André Hentschel + * + * 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. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WIN32_LEAN_AND_MEAN +#include <stdio.h> +#include <windows.h> +#include <winbase.h> + +#include <wine/debug.h> +#include <wine/unicode.h> + +WINE_DEFAULT_DEBUG_CHANNEL(cscript); + +int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cmdshow) +{ + static const WCHAR wscriptW[] = {'\\','w','s','c','r','i','p','t','.','e','x','e',0}; + static const WCHAR parbW[] = {' ','/','B',' ',0}; + WCHAR app[MAX_PATH]; + WCHAR cmd[MAX_PATH]; + PROCESS_INFORMATION pi; + BOOL ret; + DWORD exitcode; + STARTUPINFOW si = { sizeof(si) }; + + WINE_FIXME("(%p %p %s %x) forwarding to wscript\n", hInst, hPrevInst, wine_dbgstr_w(cmdline), cmdshow); + + GetSystemDirectoryW(app, MAX_PATH); + strcatW(app, wscriptW); + strcpyW(cmd, app); + strcatW(app, parbW); + strcatW(app, cmdline); + + if (!CreateProcessW(app, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) return 1; + WaitForSingleObject( pi.hProcess, INFINITE ); + + ret = GetExitCodeProcess(pi.hProcess, &exitcode); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + + if (ret) + return exitcode; + else + return 1; +}

1 0

André Hentschel : comctl32: Also free pszHeaderTitle and pszHeaderSubTitle in DestroyPropertySheetPage .
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 9e0517ac6dea9e171564a2d4ae4cb868bdf76e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e0517ac6dea9e171564a2d4a… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu Dec 29 02:51:18 2011 +0100 comctl32: Also free pszHeaderTitle and pszHeaderSubTitle in DestroyPropertySheetPage. --- dlls/comctl32/propsheet.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index e6d2d30..6f620c6 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -3063,6 +3063,12 @@ BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE hPropPage) if ((psp->dwFlags & PSP_USETITLE) && !IS_INTRESOURCE( psp->pszTitle )) Free ((LPVOID)psp->pszTitle); + if ((psp->dwFlags & PSP_USEHEADERTITLE) && !IS_INTRESOURCE( psp->pszHeaderTitle )) + Free ((LPVOID)psp->pszHeaderTitle); + + if ((psp->dwFlags & PSP_USEHEADERSUBTITLE) && !IS_INTRESOURCE( psp->pszHeaderSubTitle )) + Free ((LPVOID)psp->pszHeaderSubTitle); + Free(hPropPage); return TRUE;

1 0

Alexander E. Patrakov : dsound: Always resample buffers in mixer thread.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 663bc476029a3f867c698677f888d778246f4718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=663bc476029a3f867c698677f… Author: Alexander E. Patrakov <patrakov(a)gmail.com> Date: Fri Nov 4 12:02:23 2011 +0600 dsound: Always resample buffers in mixer thread. --- dlls/dsound/buffer.c | 10 ------ dlls/dsound/dsound_main.c | 4 -- dlls/dsound/dsound_private.h | 6 +-- dlls/dsound/mixer.c | 67 +++++++++--------------------------------- dlls/dsound/primary.c | 1 - dlls/dsound/sound3d.c | 1 - 6 files changed, 16 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=663bc476029a3f867c698…

1 0

Stefan Leichter : ntoskrnl.exe: Add stub for IoInitializeRemoveLockEx.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 34c49777a3180cd82676f9b79077f8fe8714fc80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c49777a3180cd82676f9b79… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Thu Dec 29 16:10:23 2011 +0100 ntoskrnl.exe: Add stub for IoInitializeRemoveLockEx. --- dlls/ntoskrnl.exe/ntoskrnl.c | 10 ++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index e6706d8..4f6f493 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1700,6 +1700,16 @@ BOOLEAN WINAPI IoSetThreadHardErrorMode(BOOLEAN EnableHardErrors) return FALSE; } + +/***************************************************** + * IoInitializeRemoveLockEx (NTOSKRNL.EXE.@) + */ +VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK lock, ULONG tag, + ULONG maxmin, ULONG high, ULONG size) +{ + FIXME("(%p %u %u %u %u) stub\n", lock, tag, maxmin, high, size); +} + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a391c81..187439f 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -398,7 +398,7 @@ @ stub IoGetStackLimits @ stub IoGetTopLevelIrp @ stdcall IoInitializeIrp(ptr long long) -@ stub IoInitializeRemoveLockEx +@ stdcall IoInitializeRemoveLockEx(ptr long long long long) @ stdcall IoInitializeTimer(ptr ptr ptr) @ stub IoInvalidateDeviceRelations @ stub IoInvalidateDeviceState diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 356b1f7..3865f7f 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1065,6 +1065,33 @@ typedef enum _MM_SYSTEM_SIZE MmLargeSystem } MM_SYSTEMSIZE; +typedef struct _IO_REMOVE_LOCK_COMMON_BLOCK { + BOOLEAN Removed; + BOOLEAN Reserved[3]; + LONG IoCount; + KEVENT RemoveEvent; +} IO_REMOVE_LOCK_COMMON_BLOCK; + +typedef struct _IO_REMOVE_LOCK_TRACKING_BLOCK *PIO_REMOVE_LOCK_TRACKING_BLOCK; + +typedef struct _IO_REMOVE_LOCK_DBG_BLOCK { + LONG Signature; + LONG HighWatermark; + LONGLONG MaxLockedTicks; + LONG AllocateTag; + LIST_ENTRY LockList; + KSPIN_LOCK Spin; + LONG LowMemoryCount; + ULONG Reserved1[4]; + PVOID Reserved2; + PIO_REMOVE_LOCK_TRACKING_BLOCK Blocks; +} IO_REMOVE_LOCK_DBG_BLOCK; + +typedef struct _IO_REMOVE_LOCK { + IO_REMOVE_LOCK_COMMON_BLOCK Common; + IO_REMOVE_LOCK_DBG_BLOCK Dbg; +} IO_REMOVE_LOCK, *PIO_REMOVE_LOCK; + NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); #ifdef NONAMELESSUNION @@ -1125,6 +1152,7 @@ NTSTATUS WINAPI IoGetDeviceProperty(PDEVICE_OBJECT,DEVICE_REGISTRY_PROPERTY,ULO PVOID WINAPI IoGetDriverObjectExtension(PDRIVER_OBJECT,PVOID); PDEVICE_OBJECT WINAPI IoGetRelatedDeviceObject(PFILE_OBJECT); void WINAPI IoInitializeIrp(IRP*,USHORT,CCHAR); +VOID WINAPI IoInitializeRemoveLockEx(PIO_REMOVE_LOCK,ULONG,ULONG,ULONG,ULONG); NTSTATUS WINAPI IoWMIRegistrationControl(PDEVICE_OBJECT,ULONG); PKTHREAD WINAPI KeGetCurrentThread(void);

1 0

Piotr Caban : msvcp90/tests: Test virtual function calls returning structures.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: ecbe1ff21113c50cb4260599283f7a13cb56ce77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecbe1ff21113c50cb42605992… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 29 12:45:44 2011 +0100 msvcp90/tests: Test virtual function calls returning structures. --- dlls/msvcp90/tests/misc.c | 54 ++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 8e77e95..688f344 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -30,6 +30,19 @@ typedef struct { int delfl; } MSVCP__Ctypevec; +/* basic_string<char, char_traits<char>, allocator<char>> */ +#define BUF_SIZE_CHAR 16 +typedef struct +{ + void *allocator; + union { + char buf[BUF_SIZE_CHAR]; + char *ptr; + } data; + size_t size; + size_t res; +} basic_string_char; + static void* (__cdecl *p_set_invalid_parameter_handler)(void*); static _locale_t (__cdecl *p__get_current_locale)(void); static void (__cdecl *p_free)(void*); @@ -64,6 +77,11 @@ void* (__thiscall *p_collate_char_ctor_refs)(void*, size_t); int (__thiscall *p_collate_char_compare)(const void*, const char*, const char*, const char*, const char*); void (__thiscall *p_collate_char_dtor)(void*); +void* (__thiscall *p_numpunct_char_ctor)(void*); +basic_string_char* (__thiscall *p_numpunct_char_falsename)(void*,basic_string_char*); +void (__thiscall *p_numpunct_char_dtor)(void*); +static void (__thiscall *p_basic_string_char_dtor)(basic_string_char*); +static const char* (__thiscall *p_basic_string_char_cstr)(basic_string_char*); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -97,6 +115,7 @@ static void * (WINAPI *call_thiscall_func2)( void *func, void *this, const void static void * (WINAPI *call_thiscall_func3)( void *func, void *this, const void *a, const void *b ); static void * (WINAPI *call_thiscall_func5)( void *func, void *this, const void *a, const void *b, const void *c, const void *d ); +struct thiscall_thunk_retptr *thunk_retptr; static void init_thiscall_thunk(void) { @@ -173,6 +192,13 @@ static BOOL init(void) SET(p_collate_char_ctor_refs, "??0?$collate@D@std@@QEAA@_K@Z"); SET(p_collate_char_compare, "?compare@?$collate@D@std@@QEBAHPEBD000@Z"); SET(p_collate_char_dtor, "??1?$collate@D@std@@MEAA@XZ"); + SET(p_numpunct_char_ctor, "??_F?$numpunct@D@std@@QEAAXXZ"); + SET(p_numpunct_char_falsename, "?falsename@?$numpunct@D@std@@QEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ"); + SET(p_numpunct_char_dtor, "??1?$numpunct@D@std@@MEAA@XZ"); + SET(p_basic_string_char_dtor, + "??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEAA@XZ"); + SET(p_basic_string_char_cstr, + "?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QEBAPEBDXZ"); } else { SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAADABD@Z"); SET(p_wchar_assign, "?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z"); @@ -194,6 +220,13 @@ static BOOL init(void) SET(p_collate_char_ctor_refs, "??0?$collate@D@std@@QAE@I@Z"); SET(p_collate_char_compare, "?compare@?$collate@D@std@@QBEHPBD000@Z"); SET(p_collate_char_dtor, "??1?$collate@D@std@@MAE@XZ"); + SET(p_numpunct_char_ctor, "??_F?$numpunct@D@std@@QAEXXZ"); + SET(p_numpunct_char_falsename, "?falsename@?$numpunct@D@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ"); + SET(p_numpunct_char_dtor, "??1?$numpunct@D@std@@MAE@XZ"); + SET(p_basic_string_char_dtor, + "??1?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QAE@XZ"); + SET(p_basic_string_char_cstr, + "?c_str@?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@QBEPBDXZ"); } init_thiscall_thunk(); @@ -377,19 +410,28 @@ static void test_allocator_char(void) static void test_virtual_call(void) { - BYTE collate_char[16]; + BYTE this[256]; + basic_string_char bstr; + const char *p; char str1[] = "test"; char str2[] = "TEST"; int ret; - call_func2(p_collate_char_ctor_refs, collate_char, 0); - ret = (int)call_func5(p_collate_char_compare, collate_char, str1, str1+4, str1, str1+4); + call_func2(p_collate_char_ctor_refs, this, 0); + ret = (int)call_func5(p_collate_char_compare, this, str1, str1+4, str1, str1+4); ok(ret == 0, "collate<char>::compare returned %d\n", ret); - ret = (int)call_func5(p_collate_char_compare, collate_char, str2, str2+4, str1, str1+4); + ret = (int)call_func5(p_collate_char_compare, this, str2, str2+4, str1, str1+4); ok(ret == 1, "collate<char>::compare returned %d\n", ret); - ret = (int)call_func5(p_collate_char_compare, collate_char, str1, str1+3, str1, str1+4); + ret = (int)call_func5(p_collate_char_compare, this, str1, str1+3, str1, str1+4); ok(ret == -1, "collate<char>::compare returned %d\n", ret); - call_func1(p_collate_char_dtor, collate_char); + call_func1(p_collate_char_dtor, this); + + call_func1(p_numpunct_char_ctor, this); + call_func2(p_numpunct_char_falsename, this, &bstr); + p = call_func1(p_basic_string_char_cstr, &bstr); + ok(!strcmp(p, "false"), "numpunct<char>::falsename returned %s\n", p); + call_func1(p_basic_string_char_dtor, &bstr); + call_func1(p_numpunct_char_dtor, this); } START_TEST(misc)

1 0

Piotr Caban : msvcp90: Added numpunct<char> class implementation.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 330b042f5cba3e1e2c224f2756e45a11c2ffd120 URL: http://source.winehq.org/git/wine.git/?a=commit;h=330b042f5cba3e1e2c224f275… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 29 12:45:30 2011 +0100 msvcp90: Added numpunct<char> class implementation. --- dlls/msvcp90/locale.c | 59 +++++++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 23 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 21faf77..aef22f0 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -2592,10 +2592,12 @@ MSVCP_size_t __cdecl numpunct_char__Getcat(const locale_facet **facet, const loc /* ?do_decimal_point@?$numpunct@D@std@@MBEDXZ */ /* ?do_decimal_point@?$numpunct@D@std@@MEBADXZ */ DEFINE_THISCALL_WRAPPER(numpunct_char_do_decimal_point, 4) +#define call_numpunct_char_do_decimal_point(this) CALL_VTBL_FUNC(this, 4, \ + char, (const numpunct_char *this), (this)) char __thiscall numpunct_char_do_decimal_point(const numpunct_char *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->dp; } /* ?decimal_point@?$numpunct@D@std@@QBEDXZ */ @@ -2603,17 +2605,19 @@ char __thiscall numpunct_char_do_decimal_point(const numpunct_char *this) DEFINE_THISCALL_WRAPPER(numpunct_char_decimal_point, 4) char __thiscall numpunct_char_decimal_point(const numpunct_char *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return call_numpunct_char_do_decimal_point(this); } /* ?do_thousands_sep@?$numpunct@D@std@@MBEDXZ */ /* ?do_thousands_sep@?$numpunct@D@std@@MEBADXZ */ DEFINE_THISCALL_WRAPPER(numpunct_char_do_thousands_sep, 4) +#define call_numpunct_char_do_thousands_sep(this) CALL_VTBL_FUNC(this, 8, \ + char, (const numpunct_char*), (this)) char __thiscall numpunct_char_do_thousands_sep(const numpunct_char *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return this->sep; } /* ?thousands_sep@?$numpunct@D@std@@QBEDXZ */ @@ -2621,17 +2625,20 @@ char __thiscall numpunct_char_do_thousands_sep(const numpunct_char *this) DEFINE_THISCALL_WRAPPER(numpunct_char_thousands_sep, 4) char __thiscall numpunct_char_thousands_sep(const numpunct_char *this) { - FIXME("(%p) stub\n", this); - return 0; + TRACE("(%p)\n", this); + return call_numpunct_char_do_thousands_sep(this); } /* ?do_grouping@?$numpunct@D@std@@MBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */ /* ?do_grouping@?$numpunct@D@std@@MEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */ DEFINE_THISCALL_WRAPPER(numpunct_char_do_grouping, 8) -basic_string_char* __thiscall numpunct_char_do_grouping(const numpunct_char *this, basic_string_char *ret) +#define call_numpunct_char_do_grouping(this, ret) CALL_VTBL_FUNC(this, 12, \ + basic_string_char*, (const numpunct_char*, basic_string_char*), (this, ret)) +basic_string_char* __thiscall numpunct_char_do_grouping( + const numpunct_char *this, basic_string_char *ret) { - FIXME("(%p) stub\n", this); - return ret; + TRACE("(%p)\n", this); + return MSVCP_basic_string_char_ctor_cstr(ret, this->grouping); } /* ?grouping@?$numpunct@D@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */ @@ -2639,17 +2646,20 @@ basic_string_char* __thiscall numpunct_char_do_grouping(const numpunct_char *thi DEFINE_THISCALL_WRAPPER(numpunct_char_grouping, 8) basic_string_char* __thiscall numpunct_char_grouping(const numpunct_char *this, basic_string_char *ret) { - FIXME("(%p) stub\n", this); - return ret; + TRACE("(%p)\n", this); + return call_numpunct_char_do_grouping(this, ret); } /* ?do_falsename@?$numpunct@D@std@@MBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */ /* ?do_falsename@?$numpunct@D@std@@MEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */ DEFINE_THISCALL_WRAPPER(numpunct_char_do_falsename, 8) -basic_string_char* __thiscall numpunct_char_do_falsename(const numpunct_char *this, basic_string_char *ret) +#define call_numpunct_char_do_falsename(this, ret) CALL_VTBL_FUNC(this, 16, \ + basic_string_char*, (const numpunct_char*, basic_string_char*), (this, ret)) +basic_string_char* __thiscall numpunct_char_do_falsename( + const numpunct_char *this, basic_string_char *ret) { - FIXME("(%p) stub\n", this); - return ret; + TRACE("(%p)\n", this); + return MSVCP_basic_string_char_ctor_cstr(ret, this->false_name); } /* ?falsename@?$numpunct@D@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */ @@ -2657,17 +2667,20 @@ basic_string_char* __thiscall numpunct_char_do_falsename(const numpunct_char *th DEFINE_THISCALL_WRAPPER(numpunct_char_falsename, 8) basic_string_char* __thiscall numpunct_char_falsename(const numpunct_char *this, basic_string_char *ret) { - FIXME("(%p) stub\n", this); - return ret; + TRACE("(%p)\n", this); + return call_numpunct_char_do_falsename(this, ret); } /* ?do_truename@?$numpunct@D@std@@MBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */ /* ?do_truename@?$numpunct@D@std@@MEBA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */ DEFINE_THISCALL_WRAPPER(numpunct_char_do_truename, 8) -basic_string_char* __thiscall numpunct_char_do_truename(const numpunct_char *this, basic_string_char *ret) +#define call_numpunct_char_do_truename(this, ret) CALL_VTBL_FUNC(this, 20, \ + basic_string_char*, (const numpunct_char*, basic_string_char*), (this, ret)) +basic_string_char* __thiscall numpunct_char_do_truename( + const numpunct_char *this, basic_string_char *ret) { - FIXME("(%p) stub\n", this); - return ret; + TRACE("(%p)\n", this); + return MSVCP_basic_string_char_ctor_cstr(ret, this->true_name); } /* ?truename@?$numpunct@D@std@@QBE?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@2@XZ */ @@ -2675,8 +2688,8 @@ basic_string_char* __thiscall numpunct_char_do_truename(const numpunct_char *thi DEFINE_THISCALL_WRAPPER(numpunct_char_truename, 8) basic_string_char* __thiscall numpunct_char_truename(const numpunct_char *this, basic_string_char *ret) { - FIXME("(%p) stub\n", this); - return ret; + TRACE("(%p)\n", this); + return call_numpunct_char_do_truename(this, ret); } /* ?id@?$numpunct@_W@std@@2V0locale@2@A */

1 0

Piotr Caban : msvcp90: Added numpunct<char> constructors implementation.
by Alexandre Julliard 29 Dec '11

29 Dec '11

Module: wine Branch: master Commit: 8a8d5cd36237398f10bad7fd55acc96496670033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a8d5cd36237398f10bad7fd5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Dec 29 12:45:12 2011 +0100 msvcp90: Added numpunct<char> constructors implementation. --- dlls/msvcp90/locale.c | 88 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 76 insertions(+), 12 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 2bd07c1..21faf77 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -2438,7 +2438,46 @@ extern const vtable_ptr MSVCP_numpunct_char_vtable; DEFINE_THISCALL_WRAPPER(numpunct_char__Init, 12) void __thiscall numpunct_char__Init(numpunct_char *this, _Locinfo *locinfo, MSVCP_bool isdef) { - FIXME("(%p %p %d) stub\n", this, locinfo, isdef); + const struct lconv *lc = _Locinfo__Getlconv(locinfo); + int len; + + TRACE("(%p %p %d)\n", this, locinfo, isdef); + + len = strlen(_Locinfo__Getfalse(locinfo))+1; + this->false_name = MSVCRT_operator_new(len); + if(this->false_name) + memcpy((char*)this->false_name, _Locinfo__Getfalse(locinfo), len); + + len = strlen(_Locinfo__Gettrue(locinfo))+1; + this->true_name = MSVCRT_operator_new(len); + if(this->true_name) + memcpy((char*)this->true_name, _Locinfo__Gettrue(locinfo), len); + + if(isdef) { + this->grouping = MSVCRT_operator_new(1); + if(this->grouping) + *(char*)this->grouping = 0; + + this->dp = '.'; + this->sep = ','; + } else { + len = strlen(lc->grouping)+1; + this->grouping = MSVCRT_operator_new(len); + if(this->grouping) + memcpy((char*)this->grouping, lc->grouping, len); + + this->dp = lc->decimal_point[0]; + this->sep = lc->thousands_sep[0]; + } + + if(!this->false_name || !this->true_name || !this->grouping) { + MSVCRT_operator_delete((char*)this->grouping); + MSVCRT_operator_delete((char*)this->false_name); + MSVCRT_operator_delete((char*)this->true_name); + + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + } } /* ?_Tidy@?$numpunct@D@std@@AAEXXZ */ @@ -2446,7 +2485,11 @@ void __thiscall numpunct_char__Init(numpunct_char *this, _Locinfo *locinfo, MSVC DEFINE_THISCALL_WRAPPER(numpunct_char__Tidy, 4) void __thiscall numpunct_char__Tidy(numpunct_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + + MSVCRT_operator_delete((char*)this->grouping); + MSVCRT_operator_delete((char*)this->false_name); + MSVCRT_operator_delete((char*)this->true_name); } /* ??0?$numpunct@D@std@@QAE@ABV_Locinfo@1@I_N@Z */ @@ -2455,9 +2498,11 @@ DEFINE_THISCALL_WRAPPER(numpunct_char_ctor_locinfo, 16) numpunct_char* __thiscall numpunct_char_ctor_locinfo(numpunct_char *this, _Locinfo *locinfo, MSVCP_size_t refs, MSVCP_bool usedef) { - FIXME("(%p %p %lu %d) stub\n", this, locinfo, refs, usedef); + TRACE("(%p %p %lu %d)\n", this, locinfo, refs, usedef); + locale_facet_ctor_refs(&this->facet, refs); this->facet.vtable = &MSVCP_numpunct_char_vtable; - return NULL; + numpunct_char__Init(this, locinfo, usedef); + return this; } /* ??0?$numpunct@D@std@@IAE@PBDI_N@Z */ @@ -2466,9 +2511,16 @@ DEFINE_THISCALL_WRAPPER(numpunct_char_ctor_name, 16) numpunct_char* __thiscall numpunct_char_ctor_name(numpunct_char *this, const char *name, MSVCP_size_t refs, MSVCP_bool usedef) { - FIXME("(%p %s %lu %d) stub\n", this, debugstr_a(name), refs, usedef); + _Locinfo locinfo; + + TRACE("(%p %s %lu %d)\n", this, debugstr_a(name), refs, usedef); + locale_facet_ctor_refs(&this->facet, refs); this->facet.vtable = &MSVCP_numpunct_char_vtable; - return NULL; + + _Locinfo_ctor_cstr(&locinfo, name); + numpunct_char__Init(this, &locinfo, usedef); + _Locinfo_dtor(&locinfo); + return this; } /* ??0?$numpunct@D@std@@QAE@I@Z */ @@ -2476,9 +2528,8 @@ numpunct_char* __thiscall numpunct_char_ctor_name(numpunct_char *this, DEFINE_THISCALL_WRAPPER(numpunct_char_ctor_refs, 8) numpunct_char* __thiscall numpunct_char_ctor_refs(numpunct_char *this, MSVCP_size_t refs) { - FIXME("(%p %lu) stub\n", this, refs); - this->facet.vtable = &MSVCP_numpunct_char_vtable; - return NULL; + TRACE("(%p %lu)\n", this, refs); + return numpunct_char_ctor_name(this, "C", refs, FALSE); } /* ??_F?$numpunct@D@std@@QAEXXZ */ @@ -2494,7 +2545,8 @@ numpunct_char* __thiscall numpunct_char_ctor(numpunct_char *this) DEFINE_THISCALL_WRAPPER(numpunct_char_dtor, 4) void __thiscall numpunct_char_dtor(numpunct_char *this) { - FIXME("(%p) stub\n", this); + TRACE("(%p)\n", this); + numpunct_char__Tidy(this); } DEFINE_THISCALL_WRAPPER(MSVCP_numpunct_char_vector_dtor, 8) @@ -2521,8 +2573,20 @@ numpunct_char* __thiscall MSVCP_numpunct_char_vector_dtor(numpunct_char *this, u /* ?_Getcat@?$numpunct@D@std@@SA_KPEAPEBVfacet@locale@2@PEBV42@@Z */ MSVCP_size_t __cdecl numpunct_char__Getcat(const locale_facet **facet, const locale *loc) { - FIXME("(%p %p) stub\n", facet, loc); - return 0; + TRACE("(%p %p)\n", facet, loc); + + if(facet && !*facet) { + *facet = MSVCRT_operator_new(sizeof(numpunct_char)); + if(!*facet) { + ERR("Out of memory\n"); + throw_exception(EXCEPTION_BAD_ALLOC, NULL); + return 0; + } + numpunct_char_ctor_name((numpunct_char*)*facet, + MSVCP_basic_string_char_c_str(&loc->ptr->name), 0, TRUE); + } + + return LC_NUMERIC; } /* ?do_decimal_point@?$numpunct@D@std@@MBEDXZ */

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2011