June 2012 - Wine-Commits - list.winehq.org

Frédéric Delanoy : French translation for release 1.5.6
by Jeremy Newman June 14, 2012

June 14, 2012

Module: website Branch: master Commit: 5f5d533ac6fcfae9f484e0045b1fdeaeb96ba06d URL: http://source.winehq.org/git/website.git/?a=commit;h=5f5d533ac6fcfae9f484e0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jun 14 14:29:41 2012 +0200 French translation for release 1.5.6 --- news/fr/2012060801.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/fr/2012060801.xml b/news/fr/2012060801.xml new file mode 100644 index 0000000..831f435 --- /dev/null +++ b/news/fr/2012060801.xml @@ -0,0 +1,17 @@ +<news> +<date>8 juin 2012</date> +<title>Sortie de Wine 1.5.6</title> +<body> + La version de développement 1.5.6 de Wine est disponible. + <a href="{$root}/announce/1.5.6">Nouveautés</a> de cette version : +<ul> + <li>Installation automatique du module externe Mono.</li> + <li>Applet pour les joysticks dans le panneau de configuration.</li> + <li>Rendu des images matricielles indépendantes du périphérique à présent effectué par le moteur DIB.</li> + <li>Prise en charge du rendu vidéo via DirectX (VMR-9).</li> + <li>Premiers pas en vue d'un compilateur de shaders D3D.</li> + <li>Correctifs pour la compilation sous DragonFly BSD.</li> + <li>Diverses corrections de bogues.</li> +</ul> +Le <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.6.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0

Henri Verbeet : ddraw: Merge ddraw_surface_destroy() into ddraw_surface_cleanup().
by Alexandre Julliard June 13, 2012

June 13, 2012

Module: wine Branch: master Commit: c722f2d31ec61fe372e466957605b222ee6f9a7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c722f2d31ec61fe372e466957… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 13 18:23:35 2012 +0200 ddraw: Merge ddraw_surface_destroy() into ddraw_surface_cleanup(). --- dlls/ddraw/surface.c | 51 ++++++++++-------------------------------- dlls/ddraw/tests/dsurface.c | 2 +- 2 files changed, 13 insertions(+), 40 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d1309ee..3f9f78f 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -444,37 +444,6 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) return IUnknown_AddRef(surface->texture_outer); } -/***************************************************************************** - * ddraw_surface_destroy - * - * A helper function for IDirectDrawSurface7::Release - * - * Frees the surface, regardless of its refcount. - * See IDirectDrawSurface7::Release for more information - * - * Params: - * This: Surface to free - * - *****************************************************************************/ -static void ddraw_surface_destroy(struct ddraw_surface *This) -{ - TRACE("surface %p.\n", This); - - /* Check the iface count and give a warning */ - if(This->iface_count > 1) - { - /* This can happen when a complex surface is destroyed, - * because the 2nd surface was addref()ed when the app - * called GetAttachedSurface - */ - WARN("(%p): Destroying surface with refcounts 7: %d 4: %d 3: %d 2: %d 1: %d\n", - This, This->ref7, This->ref4, This->ref3, This->ref2, This->ref1); - } - - if (This->wined3d_surface) - wined3d_surface_decref(This->wined3d_surface); -} - static void ddraw_surface_cleanup(struct ddraw_surface *surface) { struct ddraw_surface *surf; @@ -498,20 +467,24 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) surf = surface->complex_array[i]; surface->complex_array[i] = NULL; - while (surf) - { - struct ddraw_surface *destroy = surf; - surf = surf->complex_array[0]; /* Iterate through the "tree" */ - ddraw_surface_destroy(destroy); /* Destroy it */ - } + ddraw_surface_cleanup(surf); } if (surface->device1) IUnknown_Release(&surface->device1->IUnknown_inner); ifaceToRelease = surface->ifaceToRelease; - /* Destroy the root surface. */ - ddraw_surface_destroy(surface); + if (surface->iface_count > 1) + { + /* This can happen when a complex surface is destroyed, because the + * 2nd surface was addref()ed when the app called + * GetAttachedSurface(). */ + WARN("Destroying surface %p with refcounts 7: %u 4: %u 3: %u 2: %u 1: %u.\n", + surface, surface->ref7, surface->ref4, surface->ref3, surface->ref2, surface->ref1); + } + + if (surface->wined3d_surface) + wined3d_surface_decref(surface->wined3d_surface); /* Reduce the ddraw refcount */ if (ifaceToRelease) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index ecc54f1..e3cd085 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -1958,7 +1958,7 @@ static void CubeMapTest(void) IDirectDrawSurface7_Release(cubemap); ref = getRefcount((IUnknown *) palette); - todo_wine ok(ref == 1, "Refcount is %u, expected 1\n", ref); + ok(ref == 1, "Refcount is %u, expected 1\n", ref); IDirectDrawPalette_Release(palette);

1 0

Huw Davies : localspl: Remove a bunch of casts.
by Alexandre Julliard June 13, 2012

June 13, 2012

Module: wine Branch: master Commit: af8228f02a6cc3b05028f29a8f2621f847e85f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=af8228f02a6cc3b05028f29a8… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 13 16:29:26 2012 +0100 localspl: Remove a bunch of casts. --- dlls/localspl/provider.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index a599113..4a6e2d2 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -1059,6 +1059,7 @@ static BOOL WINAPI fpGetPrinterDriverDirectory(LPWSTR pName, LPWSTR pEnvironment { DWORD needed; const printenv_t * env; + WCHAR * const dir = (WCHAR *)pDriverDirectory; TRACE("(%s, %s, %d, %p, %d, %p)\n", debugstr_w(pName), debugstr_w(pEnvironment), Level, pDriverDirectory, cbBuf, pcbNeeded); @@ -1087,18 +1088,18 @@ static BOOL WINAPI fpGetPrinterDriverDirectory(LPWSTR pName, LPWSTR pEnvironment return FALSE; } - if (pDriverDirectory == NULL) { + if (dir == NULL) { /* ERROR_INVALID_USER_BUFFER is NT, ERROR_INVALID_PARAMETER is win9x */ SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; } - GetSystemDirectoryW((LPWSTR) pDriverDirectory, cbBuf/sizeof(WCHAR)); + GetSystemDirectoryW( dir, cbBuf / sizeof(WCHAR) ); /* add the Subdirectories */ - lstrcatW((LPWSTR) pDriverDirectory, spooldriversW); - lstrcatW((LPWSTR) pDriverDirectory, env->subdir); + lstrcatW( dir, spooldriversW ); + lstrcatW( dir, env->subdir ); - TRACE("=> %s\n", debugstr_w((LPWSTR) pDriverDirectory)); + TRACE( "=> %s\n", debugstr_w( dir ) ); return TRUE; }

1 0

Piotr Caban : msvcp90: Specify open mode in basic_ifstream<char> functions.
by Alexandre Julliard June 13, 2012

June 13, 2012

Module: wine Branch: master Commit: 30a1ed53d7a6680e48dce7db1a9fcfb9efe310bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a1ed53d7a6680e48dce7db1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 13 15:23:35 2012 +0200 msvcp90: Specify open mode in basic_ifstream<char> functions. --- dlls/msvcp90/ios.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a2bf8b0..d5949ff 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -5037,7 +5037,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name(basic_ifstream_cha basic_ifstream_char_ctor(this, virt_init); - if(!basic_filebuf_char_open(&this->filebuf, name, mode, prot)) { + if(!basic_filebuf_char_open(&this->filebuf, name, mode|OPENMODE_in, prot)) { basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base); basic_ios_char_setstate(basic_ios, IOSTATE_failbit); } @@ -5046,6 +5046,8 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name(basic_ifstream_cha /* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PBGHH@Z */ /* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEBGHH@Z */ +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAE(a)PB_WHH@Z */ +/* ??0?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAA(a)PEB_WHH@Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_ctor_name_wchar, 20) basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name_wchar(basic_ifstream_char *this, const wchar_t *name, int mode, int prot, MSVCP_bool virt_init) @@ -5054,7 +5056,7 @@ basic_ifstream_char* __thiscall basic_ifstream_char_ctor_name_wchar(basic_ifstre basic_ifstream_char_ctor(this, virt_init); - if(!basic_filebuf_char_open_wchar(&this->filebuf, name, mode, prot)) { + if(!basic_filebuf_char_open_wchar(&this->filebuf, name, mode|OPENMODE_in, prot)) { basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base); basic_ios_char_setstate(basic_ios, IOSTATE_failbit); } @@ -5136,7 +5138,7 @@ void __thiscall basic_ifstream_char_open(basic_ifstream_char *this, { TRACE("(%p %s %d %d)\n", this, name, mode, prot); - if(!basic_filebuf_char_open(&this->filebuf, name, mode, prot)) { + if(!basic_filebuf_char_open(&this->filebuf, name, mode|OPENMODE_in, prot)) { basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base); basic_ios_char_setstate(basic_ios, IOSTATE_failbit); } @@ -5146,20 +5148,22 @@ void __thiscall basic_ifstream_char_open(basic_ifstream_char *this, /* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBDI(a)Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_open_old, 12) void __thiscall basic_ifstream_char_open_old(basic_ifstream_char *this, - const char *name, unsigned int mod) + const char *name, unsigned int mode) { - basic_ifstream_char_open(this, name, mod, _SH_DENYNO); + basic_ifstream_char_open(this, name, mode, _SH_DENYNO); } /* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBGHH(a)Z */ /* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBGHH(a)Z */ +/* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPB_WHH(a)Z */ +/* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEB_WHH(a)Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_open_wchar, 16) void __thiscall basic_ifstream_char_open_wchar(basic_ifstream_char *this, const wchar_t *name, int mode, int prot) { TRACE("(%p %s %d %d)\n", this, debugstr_w(name), mode, prot); - if(!basic_filebuf_char_open_wchar(&this->filebuf, name, mode, prot)) { + if(!basic_filebuf_char_open_wchar(&this->filebuf, name, mode|OPENMODE_in, prot)) { basic_ios_char *basic_ios = basic_istream_char_get_basic_ios(&this->base); basic_ios_char_setstate(basic_ios, IOSTATE_failbit); } @@ -5167,6 +5171,8 @@ void __thiscall basic_ifstream_char_open_wchar(basic_ifstream_char *this, /* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPBGI(a)Z */ /* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEBGI(a)Z */ +/* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QAEXPB_WI(a)Z */ +/* ?open@?$basic_ifstream(a)DU?$char_traits(a)D@std@@@std@@QEAAXPEB_WI(a)Z */ DEFINE_THISCALL_WRAPPER(basic_ifstream_char_open_wchar_old, 12) void __thiscall basic_ifstream_char_open_wchar_old(basic_ifstream_char *this, const wchar_t *name, unsigned int mode)

1 0

Piotr Caban : msvcp90: Added basic_ofstream<char> implementation.
by Alexandre Julliard June 13, 2012

June 13, 2012

Module: wine Branch: master Commit: 43d99a1b684e9cd7c68e16f553cdf3a79afbac2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=43d99a1b684e9cd7c68e16f55… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Jun 13 15:22:29 2012 +0200 msvcp90: Added basic_ofstream<char> implementation. --- dlls/msvcp90/ios.c | 235 ++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcp90/msvcp90.spec | 68 +++++++------- 2 files changed, 265 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43d99a1b684e9cd7c68e1…

1 0

Huw Davies : winspool: Set the timeout entries to zero.
by Alexandre Julliard June 13, 2012

June 13, 2012

Module: wine Branch: master Commit: b5511bd4fe1fc1a94623a119d3eb57ed8cad0b01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5511bd4fe1fc1a94623a119d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 13 15:41:40 2012 +0100 winspool: Set the timeout entries to zero. --- dlls/winspool.drv/info.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 01081c2..512e11f 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3068,6 +3068,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) if (!pi->pDevMode) HeapFree( GetProcessHeap(), 0, dm ); set_reg_szW(hkeyPrinter, DescriptionW, pi->pComment); + set_reg_DWORD(hkeyPrinter, dnsTimeoutW, 0); set_reg_szW(hkeyPrinter, LocationW, pi->pLocation); set_reg_szW(hkeyPrinter, NameW, pi->pPrinterName); set_reg_szW(hkeyPrinter, ParametersW, pi->pParameters); @@ -3080,6 +3081,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) set_reg_szW(hkeyPrinter, Share_NameW, pi->pShareName); set_reg_DWORD(hkeyPrinter, StartTimeW, pi->StartTime); set_reg_DWORD(hkeyPrinter, StatusW, pi->Status); + set_reg_DWORD(hkeyPrinter, txTimeoutW, 0); set_reg_DWORD(hkeyPrinter, UntilTimeW, pi->UntilTime); RegCloseKey(hkeyPrinter);

1 0

Huw Davies : winspool: Use the helper to set DWORD registry values.
by Alexandre Julliard June 13, 2012

June 13, 2012

Module: wine Branch: master Commit: 7d615965fcb20443065604bffeeea63467c3a65c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d615965fcb20443065604bff… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 13 15:41:39 2012 +0100 winspool: Use the helper to set DWORD registry values. --- dlls/winspool.drv/info.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 330a7a5..01081c2 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -3029,8 +3029,7 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) } set_devices_and_printerports(pi); - RegSetValueExW(hkeyPrinter, AttributesW, 0, REG_DWORD, - (LPBYTE)&pi->Attributes, sizeof(DWORD)); + set_reg_DWORD(hkeyPrinter, AttributesW, pi->Attributes); set_reg_szW(hkeyPrinter, DatatypeW, pi->pDatatype); /* See if we can load the driver. We may need the devmode structure anyway @@ -3076,16 +3075,12 @@ HANDLE WINAPI AddPrinterW(LPWSTR pName, DWORD Level, LPBYTE pPrinter) set_reg_szW(hkeyPrinter, PortW, pi->pPortName); set_reg_szW(hkeyPrinter, Print_ProcessorW, pi->pPrintProcessor); set_reg_szW(hkeyPrinter, Printer_DriverW, pi->pDriverName); - RegSetValueExW(hkeyPrinter, PriorityW, 0, REG_DWORD, - (LPBYTE)&pi->Priority, sizeof(DWORD)); + set_reg_DWORD(hkeyPrinter, PriorityW, pi->Priority); set_reg_szW(hkeyPrinter, Separator_FileW, pi->pSepFile); set_reg_szW(hkeyPrinter, Share_NameW, pi->pShareName); - RegSetValueExW(hkeyPrinter, StartTimeW, 0, REG_DWORD, - (LPBYTE)&pi->StartTime, sizeof(DWORD)); - RegSetValueExW(hkeyPrinter, StatusW, 0, REG_DWORD, - (LPBYTE)&pi->Status, sizeof(DWORD)); - RegSetValueExW(hkeyPrinter, UntilTimeW, 0, REG_DWORD, - (LPBYTE)&pi->UntilTime, sizeof(DWORD)); + set_reg_DWORD(hkeyPrinter, StartTimeW, pi->StartTime); + set_reg_DWORD(hkeyPrinter, StatusW, pi->Status); + set_reg_DWORD(hkeyPrinter, UntilTimeW, pi->UntilTime); RegCloseKey(hkeyPrinter); RegCloseKey(hkeyPrinters);

1 0

Huw Davies : winspool: Update the ppd for LPR printers too.
by Alexandre Julliard June 13, 2012

June 13, 2012

Module: wine Branch: master Commit: f15f359cbf9c12c56415c295f2466bf1e74b855d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f15f359cbf9c12c56415c295f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 13 15:41:38 2012 +0100 winspool: Update the ppd for LPR printers too. --- dlls/winspool.drv/info.c | 48 ++++++++++++++++++++++++++++----------- dlls/winspool.drv/tests/info.c | 1 - 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index ed470bb..330a7a5 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -888,23 +888,34 @@ static BOOL CUPS_LoadPrinters(void) return TRUE; } -static char *get_cups_name( HANDLE printer ) +#endif + +static char *get_queue_name( HANDLE printer, BOOL *cups ) { - WCHAR *port; + WCHAR *port, *name = NULL; DWORD err, needed, type; char *ret = NULL; HKEY key; + *cups = FALSE; + err = WINSPOOL_GetOpenedPrinterRegKey( printer, &key ); if (err) return NULL; err = RegQueryValueExW( key, PortW, 0, &type, NULL, &needed ); - if (err || needed <= sizeof( CUPS_Port )) goto end; + if (err) goto end; port = HeapAlloc( GetProcessHeap(), 0, needed ); if (!port) goto end; RegQueryValueExW( key, PortW, 0, &type, (BYTE*)port, &needed ); - if (!memcmp( port, CUPS_Port, sizeof(CUPS_Port) - sizeof(WCHAR) )) + + if (!strncmpW( port, CUPS_Port, sizeof(CUPS_Port) / sizeof(WCHAR) -1 )) + { + name = port + sizeof(CUPS_Port) / sizeof(WCHAR) - 1; + *cups = TRUE; + } + else if (!strncmpW( port, LPR_Port, sizeof(LPR_Port) / sizeof(WCHAR) -1 )) + name = port + sizeof(LPR_Port) / sizeof(WCHAR) - 1; + if (name) { - WCHAR *name = port + sizeof(CUPS_Port) / sizeof(WCHAR) - 1; needed = WideCharToMultiByte( CP_UNIXCP, 0, name, -1, NULL, 0, NULL, NULL ); ret = HeapAlloc( GetProcessHeap(), 0, needed ); if(ret) WideCharToMultiByte( CP_UNIXCP, 0, name, -1, ret, needed, NULL, NULL ); @@ -914,23 +925,30 @@ end: RegCloseKey( key ); return ret; } -#endif + static BOOL update_driver( HANDLE printer ) { - BOOL ret = FALSE; -#ifdef SONAME_LIBCUPS + BOOL ret, is_cups; const WCHAR *name = get_opened_printer_name( printer ); WCHAR *ppd_dir, *ppd; - char *cups_name; + char *queue_name; if (!name) return FALSE; - cups_name = get_cups_name( printer ); - if (!cups_name) return FALSE; + queue_name = get_queue_name( printer, &is_cups ); + if (!queue_name) return FALSE; ppd_dir = get_ppd_dir(); ppd = get_ppd_filename( ppd_dir, name ); - if (get_cups_ppd( cups_name, ppd )) + +#ifdef SONAME_LIBCUPS + if (is_cups) + ret = get_cups_ppd( queue_name, ppd ); + else +#endif + ret = get_fallback_ppd( queue_name, ppd ); + + if (ret) { TRACE( "updating driver %s\n", debugstr_w( name ) ); ret = add_printer_driver( name, ppd ); @@ -938,8 +956,7 @@ static BOOL update_driver( HANDLE printer ) } HeapFree( GetProcessHeap(), 0, ppd_dir ); HeapFree( GetProcessHeap(), 0, ppd ); - HeapFree( GetProcessHeap(), 0, cups_name ); -#endif + HeapFree( GetProcessHeap(), 0, queue_name ); return ret; } @@ -1024,10 +1041,13 @@ static BOOL PRINTCAP_ParseEntry( const char *pent, BOOL isfirst ) MultiByteToWideChar(CP_ACP, 0, devname, -1, devnameW, sizeof(devnameW) / sizeof(WCHAR)); if(RegOpenKeyA(hkeyPrinters, devname, &hkeyPrinter) == ERROR_SUCCESS) { + DWORD status = get_dword_from_reg( hkeyPrinter, StatusW ); /* Printer already in registry, delete the tag added in WINSPOOL_LoadSystemPrinters and continue */ TRACE("Printer already exists\n"); RegDeleteValueW(hkeyPrinter, May_Delete_Value); + /* flag that the PPD file should be checked for an update */ + set_reg_DWORD( hkeyPrinter, StatusW, status | PRINTER_STATUS_DRIVER_UPDATE_NEEDED ); RegCloseKey(hkeyPrinter); } else { static CHAR data_type[] = "RAW", diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index b9d2201..3aab0e2 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2596,7 +2596,6 @@ static void test_GetPrinterDriver(void) hf = CreateFileA(di_2->pDataFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if(hf != INVALID_HANDLE_VALUE) CloseHandle(hf); - todo_wine ok(hf != INVALID_HANDLE_VALUE, "Could not open %s\n", di_2->pDataFile); hf = CreateFileA(di_2->pConfigFile, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

1 0

Francois Gouget : msvcrt: Fix the name of the Portuguese locale alias.
by Alexandre Julliard June 13, 2012

June 13, 2012

Module: wine Branch: master Commit: d8ed347ab390ccdd2b413df31fa4d62f9e863744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ed347ab390ccdd2b413df31… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 13 19:47:54 2012 +0200 msvcrt: Fix the name of the Portuguese locale alias. --- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/tests/locale.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 97b82ec..b26a9c8 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -85,7 +85,7 @@ static const char * const _country_synonyms[] = "german-swiss", "des", "italian-swiss", "its", "german-austrian", "dea", - "portugese", "ptb", + "portuguese", "ptb", "portuguese-brazil", "ptb", "spanish-mexican", "esm", "norwegian-bokmal", "nor", diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c index 8d6a34f..638a3d2 100644 --- a/dlls/msvcrt/tests/locale.c +++ b/dlls/msvcrt/tests/locale.c @@ -472,7 +472,7 @@ static void test_setlocale(void) if(ret) ok(!strcmp(ret, "Polish_Poland.1250"), "ret = %s\n", ret); - ret = setlocale(LC_ALL, "portugese"); + ret = setlocale(LC_ALL, "portuguese"); ok(ret != NULL || broken (ret == NULL), "ret == NULL\n"); if(ret) ok(!strcmp(ret, "Portuguese_Brazil.1252"), "ret = %s\n", ret);

1 0

Francois Gouget : d3dcompiler_43: Make debug_dump_ir_constructor() static.
by Alexandre Julliard June 13, 2012

June 13, 2012

Module: wine Branch: master Commit: 768c38034cf5faee00ccc8edcff7540737420f7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=768c38034cf5faee00ccc8edc… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jun 13 19:46:54 2012 +0200 d3dcompiler_43: Make debug_dump_ir_constructor() static. --- dlls/d3dcompiler_43/utils.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c index 9c222cd..350a116 100644 --- a/dlls/d3dcompiler_43/utils.c +++ b/dlls/d3dcompiler_43/utils.c @@ -1139,7 +1139,7 @@ static void debug_dump_ir_constant(const struct hlsl_ir_constant *constant) TRACE("}"); } -void debug_dump_ir_constructor(const struct hlsl_ir_constructor *constructor) +static void debug_dump_ir_constructor(const struct hlsl_ir_constructor *constructor) { struct hlsl_ir_node *arg;

1 0