January 2013 - Wine-commits

Henri Verbeet : wined3d: Get rid of the surface_type parameter to wined3d_check_device_format().
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: 1249976eb69343b086ac4d0c1f332ee8b4051c7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1249976eb69343b086ac4d0c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 17 10:24:28 2013 +0100 wined3d: Get rid of the surface_type parameter to wined3d_check_device_format(). --- dlls/d3d8/directx.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/ddraw/ddraw.c | 34 +++++++++++++++------------------- dlls/ddraw/ddraw_private.h | 14 +++++++------- dlls/ddraw/device.c | 17 +++++++---------- dlls/ddraw/main.c | 10 +++++----- dlls/wined3d/directx.c | 22 ++++++++++------------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 9 +-------- 9 files changed, 48 insertions(+), 64 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1249976eb69343b086ac4…

1 0

Henri Verbeet : wined3d: Get rid of the "opengl" field in struct wined3d_adapter.
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: 6c7cce55a771459ab361d29eb09439997f0f506a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7cce55a771459ab361d29eb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 17 10:24:29 2013 +0100 wined3d: Get rid of the "opengl" field in struct wined3d_adapter. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/directx.c | 4 +--- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 491c224..40ffe66 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1188,7 +1188,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, if (device->d3d_initialized) return WINED3DERR_INVALIDCALL; - if (!device->adapter->opengl) + if (device->wined3d->flags & WINED3D_NO3D) return WINED3DERR_INVALIDCALL; device->valid_rt_mask = 0; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e5b7f33..b8fba57 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -5137,8 +5137,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte WINEDDSCAPS_VISIBLE; caps->ddraw_caps.stride_align = DDRAW_PITCH_ALIGNMENT; - /* Set D3D caps if OpenGL is available. */ - if (adapter->opengl) + if (!(wined3d->flags & WINED3D_NO3D)) { caps->ddraw_caps.dds_caps |= WINEDDSCAPS_3DDEVICE | WINEDDSCAPS_MIPMAP | @@ -5601,7 +5600,6 @@ static BOOL InitAdapters(struct wined3d *wined3d) select_shader_mode(&adapter->gl_info, &ps_selected_mode, &vs_selected_mode); fillGLAttribFuncs(&adapter->gl_info); - adapter->opengl = TRUE; } wined3d->adapter_count = 1; TRACE("%u adapters successfully initialized.\n", wined3d->adapter_count); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ed777e5..af5ad2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1569,8 +1569,6 @@ struct wined3d_driver_info struct wined3d_adapter { UINT ordinal; - BOOL opengl; - POINT monitorPoint; enum wined3d_format_id screen_format;

1 0

Piotr Caban : tools: Update make_specfiles script.
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: 48c19ac11320caa562cd23476644d0f71d23f918 URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c19ac11320caa562cd23476… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 16 14:36:40 2013 +0100 tools: Update make_specfiles script. --- tools/make_specfiles | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/make_specfiles b/tools/make_specfiles index 9a17e9c..4e68a1e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -43,8 +43,8 @@ my @dll_groups = "msvcrt", "msvcp90", "msvcp100", - "msvcp80", "msvcp71", + "msvcp80", "msvcp70", "msvcp60", ],

1 0

Piotr Caban : msvcp70: Remove forwards to msvcp80.
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: b0bf0612356715246e0558dcd863226c820bb5fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0bf0612356715246e0558dcd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 16 14:36:50 2013 +0100 msvcp70: Remove forwards to msvcp80. --- dlls/msvcp70/msvcp70.spec | 48 ++++++++++++++++++++++---------------------- 1 files changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp70/msvcp70.spec b/dlls/msvcp70/msvcp70.spec index c3856fb..a8de66c 100644 --- a/dlls/msvcp70/msvcp70.spec +++ b/dlls/msvcp70/msvcp70.spec @@ -1815,24 +1815,24 @@ @ stub -arch=win32 ?_Fput@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@2(a)V32@AAVios_base(a)2@GPBDIIII(a)Z @ stub -arch=win32 ?_Fput@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@KA?AV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@2(a)V32@AAVios_base(a)2@_WPBDIIII(a)Z @ extern ?_Fpz(a)std@@3_JA msvcp90.?_Fpz(a)std@@3_JA -@ cdecl -arch=win32 ?_Getcat@?$codecvt(a)DDH@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$codecvt(a)DDH@std@@SAIPAPBVfacet(a)locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$codecvt(a)DDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$codecvt(a)DDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$codecvt(a)GDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$codecvt(a)GDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$codecvt(a)_WDH@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$codecvt(a)_WDH@std@@SAIPAPBVfacet(a)locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$codecvt(a)_WDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$codecvt(a)_WDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$collate(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$collate(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$collate(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$collate(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$collate(a)G@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$collate(a)G@std@@SAIPAPBVfacet(a)locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$collate(a)G@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$collate(a)G@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$collate(a)_W@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$collate(a)_W@std@@SAIPAPBVfacet(a)locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$collate(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$collate(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$ctype(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$ctype(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$ctype(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$ctype(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$ctype(a)G@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$ctype(a)G@std@@SAIPAPBVfacet(a)locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$ctype(a)G@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$ctype(a)G@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$ctype(a)_W@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$ctype(a)_W@std@@SAIPAPBVfacet(a)locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$ctype(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$ctype(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$codecvt(a)DDH@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$codecvt(a)DDH@std@@SAIPAPBVfacet(a)locale@2@@Z +@ cdecl -arch=win64 ?_Getcat@?$codecvt(a)DDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$codecvt(a)DDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$codecvt(a)GDH@std@@SAIPAPBVfacet(a)locale@2@@Z +@ cdecl -arch=win64 ?_Getcat@?$codecvt(a)GDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$codecvt(a)GDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$codecvt(a)_WDH@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$codecvt(a)_WDH@std@@SAIPAPBVfacet(a)locale@2@@Z +@ cdecl -arch=win64 ?_Getcat@?$codecvt(a)_WDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$codecvt(a)_WDH@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$collate(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$collate(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z +@ cdecl -arch=win64 ?_Getcat@?$collate(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$collate(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$collate(a)G@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$collate(a)G@std@@SAIPAPBVfacet(a)locale@2@@Z +@ cdecl -arch=win64 ?_Getcat@?$collate(a)G@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$collate(a)G@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$collate(a)_W@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$collate(a)_W@std@@SAIPAPBVfacet(a)locale@2@@Z +@ cdecl -arch=win64 ?_Getcat@?$collate(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$collate(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$ctype(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$ctype(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z +@ cdecl -arch=win64 ?_Getcat@?$ctype(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$ctype(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$ctype(a)G@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$ctype(a)G@std@@SAIPAPBVfacet(a)locale@2@@Z +@ cdecl -arch=win64 ?_Getcat@?$ctype(a)G@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$ctype(a)G@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$ctype(a)_W@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$ctype(a)_W@std@@SAIPAPBVfacet(a)locale@2@@Z +@ cdecl -arch=win64 ?_Getcat@?$ctype(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$ctype(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2@@Z @ stub -arch=win32 ?_Getcat@?$messages(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z @ stub -arch=win64 ?_Getcat@?$messages(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z @ stub -arch=win32 ?_Getcat@?$messages(a)G@std@@SAIPAPBVfacet(a)locale@2@@Z @@ -1875,12 +1875,12 @@ @ stub -arch=win64 ?_Getcat@?$num_put(a)GV?$ostreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z @ stub -arch=win32 ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z @ stub -arch=win64 ?_Getcat@?$num_put(a)_WV?$ostreambuf_iterator(a)_WU?$char_traits(a)_W@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$numpunct(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$numpunct(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$numpunct(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$numpunct(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$numpunct(a)G@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$numpunct(a)G@std@@SAIPAPBVfacet(a)locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$numpunct(a)G@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$numpunct(a)G@std@@SA_KPEAPEBVfacet(a)locale@2@@Z -@ cdecl -arch=win32 ?_Getcat@?$numpunct(a)_W@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$numpunct(a)_W@std@@SAIPAPBVfacet(a)locale@2@@Z -@ cdecl -arch=win64 ?_Getcat@?$numpunct(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp80.?_Getcat@?$numpunct(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$numpunct(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$numpunct(a)D@std@@SAIPAPBVfacet(a)locale@2@@Z +@ cdecl -arch=win64 ?_Getcat@?$numpunct(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$numpunct(a)D@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$numpunct(a)G@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$numpunct(a)G@std@@SAIPAPBVfacet(a)locale@2@@Z +@ cdecl -arch=win64 ?_Getcat@?$numpunct(a)G@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$numpunct(a)G@std@@SA_KPEAPEBVfacet(a)locale@2@@Z +@ cdecl -arch=win32 ?_Getcat@?$numpunct(a)_W@std@@SAIPAPBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$numpunct(a)_W@std@@SAIPAPBVfacet(a)locale@2@@Z +@ cdecl -arch=win64 ?_Getcat@?$numpunct(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2@@Z(ptr) msvcp71.?_Getcat@?$numpunct(a)_W@std@@SA_KPEAPEBVfacet(a)locale@2@@Z @ stub -arch=win32 ?_Getcat@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z @ stub -arch=win64 ?_Getcat@?$time_get(a)DV?$istreambuf_iterator(a)DU?$char_traits(a)D@std@@@std@@@std@@SA_KPEAPEBVfacet(a)locale@2@@Z @ stub -arch=win32 ?_Getcat@?$time_get(a)GV?$istreambuf_iterator(a)GU?$char_traits(a)G@std@@@std@@@std@@SAIPAPBVfacet(a)locale@2@@Z

1 0

Piotr Caban : cmd: Even if FindExecutable fails wait for process to finish in non-interactive mode .
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: e727e44dfa50ebc78e0efc7a2c61ef48fe1084df URL: http://source.winehq.org/git/wine.git/?a=commit;h=e727e44dfa50ebc78e0efc7a2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 16 14:40:31 2013 +0100 cmd: Even if FindExecutable fails wait for process to finish in non-interactive mode. --- programs/cmd/wcmdmain.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1145088..fbe5794 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1225,16 +1225,13 @@ void WCMD_run_program (WCHAR *command, BOOL called) if (!status) break; - if (!assumeInternal && !console) errorlevel = 0; - else - { - /* Always wait when non-interactive (cmd /c or in batch program), - or for console applications */ - if (assumeInternal || !interactive || !HIWORD(console)) - WaitForSingleObject (pe.hProcess, INFINITE); - GetExitCodeProcess (pe.hProcess, &errorlevel); - if (errorlevel == STILL_ACTIVE) errorlevel = 0; - } + /* Always wait when non-interactive (cmd /c or in batch program), + or for console applications */ + if (assumeInternal || !interactive || (console && !HIWORD(console))) + WaitForSingleObject (pe.hProcess, INFINITE); + GetExitCodeProcess (pe.hProcess, &errorlevel); + if (errorlevel == STILL_ACTIVE) errorlevel = 0; + CloseHandle(pe.hProcess); CloseHandle(pe.hThread); return;

1 0

Andrew Talbot : gdi.exe16: Avoid signed-unsigned integer comparisons.
by Alexandre Julliard 17 Jan '13

17 Jan '13

Module: wine Branch: master Commit: d2d288b13aa6a822266fd5dbbadff91d60039ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2d288b13aa6a822266fd5dbb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Jan 16 20:42:31 2013 +0000 gdi.exe16: Avoid signed-unsigned integer comparisons. --- dlls/gdi.exe16/gdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi.exe16/gdi.c b/dlls/gdi.exe16/gdi.c index 2bd070b..c2193a9 100644 --- a/dlls/gdi.exe16/gdi.c +++ b/dlls/gdi.exe16/gdi.c @@ -2361,7 +2361,7 @@ BOOL16 WINAPI GetCharWidth16( HDC16 hdc, UINT16 firstChar, UINT16 lastChar, LPIN if( buf32 ) { LPINT obuf32 = buf32; - int i; + UINT i; retVal = GetCharWidth32A( HDC_32(hdc), firstChar, lastChar, buf32); if (retVal)

1 0

Piotr Caban : msvcp90: Added complex<{float, double, long double}> constructors implementation.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: a51d65da770285a8adeacc190610a6045bccbc22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a51d65da770285a8adeacc190… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 16 14:27:04 2013 +0100 msvcp90: Added complex<{float, double, long double}> constructors implementation. --- dlls/msvcp90/math.c | 104 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.h | 13 ++++++ dlls/msvcp90/msvcp90.spec | 84 ++++++++++++++++++------------------ 3 files changed, 159 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a51d65da770285a8adeac…

1 0

Piotr Caban : msvcp90: Added operators working on complex numbers.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 733b2c3b27349d743bb5e00f736e28f215566b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=733b2c3b27349d743bb5e00f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 16 14:27:20 2013 +0100 msvcp90: Added operators working on complex numbers. --- dlls/msvcp90/math.c | 624 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 372 ++++++++++++++-------------- 2 files changed, 810 insertions(+), 186 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=733b2c3b27349d743bb5e…

1 0

Piotr Caban : msvcp90: Added basic complex numbers tests.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 383bbb87f6eb525ace688c0a8107755f56d94172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=383bbb87f6eb525ace688c0a8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 16 14:27:37 2013 +0100 msvcp90: Added basic complex numbers tests. --- dlls/msvcp90/tests/misc.c | 96 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 95 insertions(+), 1 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 2cb7380..d0a41c5 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -19,6 +19,7 @@ #include <stdio.h> #include <locale.h> #include <wctype.h> +#include <float.h> #include <windef.h> #include <winbase.h> @@ -49,6 +50,12 @@ typedef struct size_t res; } basic_string_char; +/* class complex<float> */ +typedef struct { + float real; + float imag; +} complex_float; + static void* (__cdecl *p_set_invalid_parameter_handler)(void*); static _locale_t (__cdecl *p__get_current_locale)(void); static void (__cdecl *p__free_locale)(_locale_t); @@ -101,6 +108,10 @@ static void (__thiscall *p_basic_ostringstream_char_dtor)(/*basic_ostringstream_ static void (__thiscall *p_basic_ostringstream_char_vbase_dtor)(/*basic_ostringstream_char*/void*); static void (__thiscall *p_basic_ios_char_dtor)(/*basic_ios_char*/void*); +static complex_float* (__thiscall *p_complex_float_ctor)(complex_float*, const float*, const float*); +static complex_float* (__cdecl *p_complex_float_add)(complex_float*, const complex_float*, const complex_float*); +static complex_float* (__cdecl *p_complex_float_div)(complex_float*, const complex_float*, const complex_float*); + static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, const wchar_t *function, const wchar_t *file, @@ -231,6 +242,13 @@ static BOOL init(void) "??_D?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QEAAXXZ"); SET(p_basic_ios_char_dtor, "??1?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UEAA(a)XZ"); + + SET(p_complex_float_ctor, + "??0?$complex(a)M@std@@QEAA(a)AEBM0@Z"); + SET(p_complex_float_add, + "??$?HM(a)std@@YA?AV?$complex(a)M@0(a)AEBV10@0(a)Z"); + SET(p_complex_float_div, + "??$?KM(a)std@@YA?AV?$complex(a)M@0(a)AEBV10@0(a)Z"); } else { SET(p_char_assign, "?assign@?$char_traits(a)D@std@@SAXAADABD(a)Z"); SET(p_wchar_assign, "?assign@?$char_traits(a)_W@std@@SAXAA_WAB_W(a)Z"); @@ -268,6 +286,13 @@ static BOOL init(void) "??_D?$basic_ostringstream(a)DU?$char_traits(a)D@std@@V?$allocator(a)D@2@@std@@QAEXXZ"); SET(p_basic_ios_char_dtor, "??1?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@UAE(a)XZ"); + + SET(p_complex_float_ctor, + "??0?$complex(a)M@std@@QAE(a)ABM0@Z"); + SET(p_complex_float_add, + "??$?HM(a)std@@YA?AV?$complex(a)M@0(a)ABV10@0(a)Z"); + SET(p_complex_float_div, + "??$?KM(a)std@@YA?AV?$complex(a)M@0(a)ABV10@0(a)Z"); } init_thiscall_thunk(); @@ -550,6 +575,75 @@ static void test_virtual_base_dtors(void) call_func1(p_basic_ios_char_dtor, this+((int**)this)[0][1]); } +static BOOL almost_eq(float f1, float f2) +{ + f1 = (f1-f2)/f1; + if(f1 < 0) + f1 = -f1; + return f1 < 0.0001; +} + +static void test_complex(void) +{ + complex_float c1, c2, c3; + float f1, f2; + + f1 = 1; + f2 = 2; + call_func3(p_complex_float_ctor, &c1, &f1, &f2); + ok(c1.real == 1, "c1.real = %f\n", c1.real); + ok(c1.imag == 2, "c1.imag = %f\n", c1.imag); + + f1 = -1; + f2 = 1; + call_func3(p_complex_float_ctor, &c2, &f1, &f2); + ok(c2.real == -1, "c2.real = %f\n", c1.real); + ok(c2.imag == 1, "c2.imag = %f\n", c1.imag); + + p_complex_float_add(&c3, &c1, &c2); + ok(c3.real == 0, "c3.real = %f\n", c3.real); + ok(c3.imag == 3, "c3.imag = %f\n", c3.imag); + + p_complex_float_add(&c2, &c1, &c3); + ok(c2.real == 1, "c2.real = %f\n", c1.real); + ok(c2.imag == 5, "c2.imag = %f\n", c1.imag); + + /* (1+5i) / (0+3i) */ + p_complex_float_div(&c1, &c2, &c3); + ok(almost_eq(c1.real, 1.666667), "c1.real = %f\n", c1.real); + ok(almost_eq(c1.imag, -0.33333), "c1.imag = %f\n", c1.imag); + + /* (1+5i) / (2+0i) */ + c3.real = 2; + c3.imag = 0; + p_complex_float_div(&c1, &c2, &c3); + ok(almost_eq(c1.real, 0.5), "c1.real = %f\n", c1.real); + ok(almost_eq(c1.imag, 2.5), "c1.imag = %f\n", c1.imag); + + /* (1+5i) / 0 */ + c3.real = 0; + p_complex_float_div(&c1, &c2, &c3); + ok(_isnan(c1.real), "c1.real = %f\n", c1.real); + ok(_isnan(c1.imag), "c1.imag = %f\n", c1.imag); + + /* (1+5i) / (NaN-2i) */ + c1.imag = -2; + p_complex_float_div(&c3, &c2, &c1); + ok(_isnan(c3.real), "c3.real = %f\n", c3.real); + ok(_isnan(c3.imag), "c3.imag = %f\n", c3.imag); + + /* (NaN-2i) / (1+0i) */ + c2.imag = 0; + p_complex_float_div(&c3, &c1, &c2); + ok(_isnan(c3.real), "c3.real = %f\n", c3.real); + ok(_isnan(c3.imag), "c3.imag = %f\n", c3.imag); + + /* (1+0i) + (NaN-2i) */ + p_complex_float_add(&c3, &c2, &c1); + ok(_isnan(c3.real), "c3.real = %f\n", c3.real); + ok(c3.imag == -2, "c3.imag = %f\n", c3.imag); +} + START_TEST(misc) { if(!init()) @@ -564,8 +658,8 @@ START_TEST(misc) test_towctrans(); test_virtual_call(); test_virtual_base_dtors(); - test_allocator_char(); + test_complex(); ok(!invalid_parameter, "invalid_parameter_handler was invoked too many times\n"); }

1 0

Piotr Caban : msvcp90: Added std::arg(complex) implementation.
by Alexandre Julliard 16 Jan '13

16 Jan '13

Module: wine Branch: master Commit: 3e974548378d52f83ce70cb6839ac244d2cfe5c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e974548378d52f83ce70cb68… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jan 16 14:27:53 2013 +0100 msvcp90: Added std::arg(complex) implementation. --- dlls/msvcp90/math.c | 16 ++++++++++++++++ dlls/msvcp90/msvcp90.spec | 12 ++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index e45c9e5..4587070 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1223,6 +1223,13 @@ complex_float* __thiscall complex_float_div_assign(complex_float *this, const co return complex_float_div(this, &tmp, r); } +/* ??$arg(a)M@std@@YAMABV?$complex(a)M@0@@Z */ +/* ??$arg(a)M@std@@YAMAEBV?$complex(a)M@0@@Z */ +float __cdecl complex_float_arg(const complex_float *c) +{ + return atan2(c->imag, c->real); +} + /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QAE(a)ABN0@Z */ /* ??0?$_Complex_base(a)NU_C_double_complex@@@std@@QEAA(a)AEBN0@Z */ /* ??0?$_Complex_base(a)OU_C_ldouble_complex@@@std@@QAE(a)ABO0@Z */ @@ -1622,3 +1629,12 @@ complex_double* __thiscall complex_double_div_assign(complex_double *this, const complex_double tmp = *this; return complex_double_div(this, &tmp, r); } + +/* ??$arg(a)N@std@@YANABV?$complex(a)N@0@@Z */ +/* ??$arg(a)N@std@@YANAEBV?$complex(a)N@0@@Z */ +/* ??$arg(a)O@std@@YAOABV?$complex(a)O@0@@Z */ +/* ??$arg(a)O@std@@YAOAEBV?$complex(a)O@0@@Z */ +double __cdecl complex_double_arg(const complex_double *c) +{ + return atan2(c->imag, c->real); +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 90b321a..fc2e7a8 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -356,12 +356,12 @@ @ stub -arch=win64 ??$abs(a)N@std@@YANAEBV?$complex(a)N@0@@Z @ stub -arch=win32 ??$abs(a)O@std@@YAOABV?$complex(a)O@0@@Z @ stub -arch=win64 ??$abs(a)O@std@@YAOAEBV?$complex(a)O@0@@Z -@ stub -arch=win32 ??$arg(a)M@std@@YAMABV?$complex(a)M@0@@Z -@ stub -arch=win64 ??$arg(a)M@std@@YAMAEBV?$complex(a)M@0@@Z -@ stub -arch=win32 ??$arg(a)N@std@@YANABV?$complex(a)N@0@@Z -@ stub -arch=win64 ??$arg(a)N@std@@YANAEBV?$complex(a)N@0@@Z -@ stub -arch=win32 ??$arg(a)O@std@@YAOABV?$complex(a)O@0@@Z -@ stub -arch=win64 ??$arg(a)O@std@@YAOAEBV?$complex(a)O@0@@Z +@ cdecl -arch=win32 ??$arg(a)M@std@@YAMABV?$complex(a)M@0@@Z(ptr) complex_float_arg +@ cdecl -arch=win64 ??$arg(a)M@std@@YAMAEBV?$complex(a)M@0@@Z(ptr) complex_float_arg +@ cdecl -arch=win32 ??$arg(a)N@std@@YANABV?$complex(a)N@0@@Z(ptr) complex_double_arg +@ cdecl -arch=win64 ??$arg(a)N@std@@YANAEBV?$complex(a)N@0@@Z(ptr) complex_double_arg +@ cdecl -arch=win32 ??$arg(a)O@std@@YAOABV?$complex(a)O@0@@Z(ptr) complex_double_arg +@ cdecl -arch=win64 ??$arg(a)O@std@@YAOAEBV?$complex(a)O@0@@Z(ptr) complex_double_arg @ stub -arch=win32 ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)ABV10@@Z @ stub -arch=win64 ??$conj(a)M@std@@YA?AV?$complex(a)M@0(a)AEBV10@@Z @ stub -arch=win32 ??$conj(a)N@std@@YA?AV?$complex(a)N@0(a)ABV10@@Z

1 0